diff --git a/LICENSE.txt b/LICENSE.txt
new file mode 100644
index 0000000000000000000000000000000000000000..94a9ed024d3859793618152ea559a168bbcbb5e2
--- /dev/null
+++ b/LICENSE.txt
@@ -0,0 +1,674 @@
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Use with the GNU Affero General Public License.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+    <program>  Copyright (C) <year>  <name of author>
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<http://www.gnu.org/licenses/>.
+
+  The GNU General Public License does not permit incorporating your program
+into proprietary programs.  If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.  But first, please read
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.
diff --git a/Makefile b/Makefile
index 6f9c680bb9f68356eee3b4ccbaaec659e7227e15..d3da598624f35bd81772b9e4f65ea1229c2c01d5 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 BASE=eurecap
 PLUGINTYPE=vmextended
-VERSION=0.1
+VERSION=0.3
 
 PLUGINFILES=$(BASE).php $(BASE).script.php $(BASE).xml index.html 
 # $(BASE)/
@@ -21,7 +21,7 @@ $(NONSYSTRANSLATIONS): %.ini: %.sys.ini
 
 zip: $(PLUGINFILES) $(TRANSLATIONS) $(SYSTRANSLATIONS) $(NONSYSTRANSLATIONS)
 	@echo "Packing all files into distribution file $(ZIPFILE):"
-	@zip -r $(ZIPFILE) $(PLUGINFILES) $(MVCFILES) $(TRANSLATIONS) $(FIELDS) $(ELEMENTS)
+	@zip -r $(ZIPFILE) $(PLUGINFILES) $(MVCFILES) $(TRANSLATIONS) $(FIELDS) $(ELEMENTS) LICENSE.txt
 
 clean:
 	rm -f $(ZIPFILE)
diff --git a/controllers/eurecap.php b/controllers/eurecap.php
index 1cd499efa9dea54b0929f3856960abef70d50f72..dc28f320c8e447268ab617d781144ae5b506f200 100644
--- a/controllers/eurecap.php
+++ b/controllers/eurecap.php
@@ -3,16 +3,14 @@ if( !defined( '_JEXEC' ) ) die( 'Direct Access to '.basename(__FILE__).' is not
 
 /**
 *
-* @version
 * @package VirtueMart
 * @subpackage EU Recapitulative Statement
 * @copyright Copyright (C) 2015 Open Tools, Reinhold Kainhofer.
-* @license http://www.gnu.org/copyleft/gpl.html GNU/GPL, see LICENSE.php
+* @license http://www.gnu.org/copyleft/gpl.html GNU/GPL, see LICENSE.txt
 * VirtueMart is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
 * is derivative of works licensed under the GNU General Public License or
 * other free or open source software licenses.
-* See /administrator/components/com_virtuemart/COPYRIGHT.php for copyright notices and details.
 *
 * http://www.open-tools.net
 */
diff --git a/controllers/index.html b/controllers/index.html
new file mode 100644
index 0000000000000000000000000000000000000000..2efb97f319a35f6bd80f1751134ed71ec11888eb
--- /dev/null
+++ b/controllers/index.html
@@ -0,0 +1 @@
+<!DOCTYPE html><title></title>
diff --git a/elements/eucountries.php b/elements/eucountries.php
index 7a274eae5ec690942a32f2e19b68090e1c0faeaf..1e9680ab1dd78d64e819b52c5d6f2b5269895222 100644
--- a/elements/eucountries.php
+++ b/elements/eucountries.php
@@ -2,32 +2,20 @@
 defined('_JEXEC') or die();
 
 /**
- *
- * @package	VirtueMart
- * @subpackage Plugins  - Elements
- * @author Valérie Isaksen, adapted by Reinhold Kainhofer for EU countries
- * @link http://www.virtuemart.net
- * @copyright Copyright (c) 2004 - 2011 VirtueMart Team. All rights reserved.
- * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL, see LICENSE.php
- * VirtueMart is free software. This version may have been modified pursuant
- * to the GNU General Public License, and as distributed it includes or
- * is derivative of works licensed under the GNU General Public License or
- * other free or open source software licenses.
- * @version $Id: $
- */
-/*
- * This class is used by VirtueMart Payment or Shipment Plugins
- * which uses JParameter
- * So It should be an extension of JElement
- * Those plugins cannot be configured througth the Plugin Manager anyway.
- */
-class JElementEUCountries extends JElement {
+*
+* @package VirtueMart
+* @subpackage EU Recapitulative Statement
+* @copyright Copyright (C) 2015 Open Tools, Reinhold Kainhofer.
+* @license http://www.gnu.org/copyleft/gpl.html GNU/GPL, see LICENSE.txt
+* VirtueMart is free software. This version may have been modified pursuant
+* to the GNU General Public License, and as distributed it includes or
+* is derivative of works licensed under the GNU General Public License or
+* other free or open source software licenses.
+*
+* http://www.open-tools.net
+*/
 
-    /**
-     * Element name
-     * @access	protected
-     * @var		string
-     */
+class JElementEUCountries extends JElement {
     var $_name = 'euCountries';
 
     function fetchElement($name, $value, &$node, $control_name) {
diff --git a/elements/index.html b/elements/index.html
new file mode 100644
index 0000000000000000000000000000000000000000..2efb97f319a35f6bd80f1751134ed71ec11888eb
--- /dev/null
+++ b/elements/index.html
@@ -0,0 +1 @@
+<!DOCTYPE html><title></title>
diff --git a/elements/vmorderstates.php b/elements/vmorderstates.php
index 25798b9fa8de35f7e14e0c807670ab1f01ec1a9c..024279cb7071d14e4accbb708ef078f72e72c02d 100644
--- a/elements/vmorderstates.php
+++ b/elements/vmorderstates.php
@@ -1,36 +1,23 @@
 <?php
 defined ('_JEXEC') or die();
 /**
- *
- * @package    VirtueMart
- * @subpackage Plugins  - Elements
- * @author Valérie Isaksen
- * @link http://www.virtuemart.net
- * @copyright Copyright (c) 2004 - 2011 VirtueMart Team. All rights reserved.
- * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL, see LICENSE.php
- * VirtueMart is free software. This version may have been modified pursuant
- * to the GNU General Public License, and as distributed it includes or
- * is derivative of works licensed under the GNU General Public License or
- * other free or open source software licenses.
- * @version $Id:$
- */
+*
+* @package VirtueMart
+* @subpackage EU Recapitulative Statement
+* @copyright Copyright (C) 2015 Open Tools, Reinhold Kainhofer.
+* @license http://www.gnu.org/copyleft/gpl.html GNU/GPL, see LICENSE.txt
+* VirtueMart is free software. This version may have been modified pursuant
+* to the GNU General Public License, and as distributed it includes or
+* is derivative of works licensed under the GNU General Public License or
+* other free or open source software licenses.
+*
+* http://www.open-tools.net
+*/
+
 if (!class_exists('VmConfig'))  require(JPATH_VM_ADMINISTRATOR.DS.'components'.DS.'com_virtuemart'.DS.'helpers'.DS.'config.php');
 if(!class_exists('VmModel'))    require(JPATH_VM_ADMINISTRATOR.DS.'helpers'.DS.'vmmodel.php');
 
-/*
- * This class is used by VirtueMart Payment or Shipment Plugins
- * which uses JParameter
- * So It should be an extension of JElement
- * Those plugins cannot be configured througth the Plugin Manager anyway.
- */
 class JElementVmOrderStates extends JElement {
-
-	/**
-	 * Element name
-	 *
-	 * @access    protected
-	 * @var        string
-	 */
 	var $_name = 'OrderStates';
 
 	function fetchElement ($name, $value, &$node, $control_name) {
diff --git a/elements/vmshoppergroups.php b/elements/vmshoppergroups.php
index 2cda4c2a7c763a23e8a102d6beb60b88b31daf68..0cb6d34e73b9972bc0c6dc1a690d96a2b55c9168 100644
--- a/elements/vmshoppergroups.php
+++ b/elements/vmshoppergroups.php
@@ -1,19 +1,19 @@
 <?php
 defined('_JEXEC') or die();
 /**
- *
- * @package    VirtueMart
- * @subpackage Plugins  - Elements
- * @author Valérie Isaksen
- * @link http://www.virtuemart.net
- * @copyright ${PHING.VM.COPYRIGHT}
- * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL, see LICENSE.php
- * VirtueMart is free software. This version may have been modified pursuant
- * to the GNU General Public License, and as distributed it includes or
- * is derivative of works licensed under the GNU General Public License or
- * other free or open source software licenses.
- * @version $Id$
- */
+*
+* @package VirtueMart
+* @subpackage EU Recapitulative Statement
+* @copyright Copyright (C) 2015 Open Tools, Reinhold Kainhofer.
+* @license http://www.gnu.org/copyleft/gpl.html GNU/GPL, see LICENSE.txt
+* VirtueMart is free software. This version may have been modified pursuant
+* to the GNU General Public License, and as distributed it includes or
+* is derivative of works licensed under the GNU General Public License or
+* other free or open source software licenses.
+*
+* http://www.open-tools.net
+*/
+
 if (!class_exists('JElementList')) require_once(JPATH_LIBRARIES.DS.'joomla'.DS.'html'.DS.'parameter'.DS.'element'.DS.'list.php');
 
 class JELementVmShopperGroups extends JElementList {
diff --git a/elements/vmuserfields.php b/elements/vmuserfields.php
index 3df5433312c89ab7591791cd029e6818b8f7ae3f..b7c9a751adeef4d2c097737658fecc30be139f11 100644
--- a/elements/vmuserfields.php
+++ b/elements/vmuserfields.php
@@ -7,7 +7,7 @@ defined('_JEXEC') or die();
  * @author Reinhold Kainhofer, Open Tools
  * @link http://www.open-tools.net
  * @copyright Copyright (c) 2015 Reinhold Kainhofer. All rights reserved.
- * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL, see LICENSE.php
+ * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL, see LICENSE.txt
  * VirtueMart is free software. This version may have been modified pursuant
  * to the GNU General Public License, and as distributed it includes or
  * is derivative of works licensed under the GNU General Public License or
diff --git a/eurecap.php b/eurecap.php
index 635da249d1c84687ac94876d5daaede9479283fa..6a0e84b7a8d8908980d72d8813e7daa0305f442e 100644
--- a/eurecap.php
+++ b/eurecap.php
@@ -2,15 +2,19 @@
 if( !defined( '_JEXEC' ) ) die( 'Direct Access to '.basename(__FILE__).' is not allowed.' );
 
 /**
- * Abstract class for extended plugins
- * This class provides some standard methods that can implemented to add features into the VM core
- * Be sure to include this line in the plugin file:
- * require(VMPATH_ADMIN.DS.'helpers'.DS.'vmextendedplugin.php');
- *
- * @package	VirtueMart
- * @subpackage Plugins
- * @author Reinhold Kainhofer, Open Tools
- */
+*
+* @package VirtueMart
+* @subpackage EU Recapitulative Statement
+* @copyright Copyright (C) 2015 Open Tools, Reinhold Kainhofer.
+* @license http://www.gnu.org/copyleft/gpl.html GNU/GPL, see LICENSE.txt
+* VirtueMart is free software. This version may have been modified pursuant
+* to the GNU General Public License, and as distributed it includes or
+* is derivative of works licensed under the GNU General Public License or
+* other free or open source software licenses.
+*
+* http://www.open-tools.net
+*/
+
 defined ('VMPATH_ADMIN') or define ('VMPATH_ADMIN', JPATH_VM_ADMINISTRATOR);
 defined ('VMPATH_PLUGINLIBS') or define ('VMPATH_PLUGINLIBS', JPATH_VM_PLUGINS);
 if (!class_exists('vmExtendedPlugin')) require(VMPATH_PLUGINLIBS . DS . 'vmextendedplugin.php');
@@ -40,7 +44,7 @@ class plgVmExtendedEuRecap extends vmExtendedPlugin {
 	 * @return True if this loads a file (null otherwise)
 	 */
 	public function onVmAdminController ($controller) {
-		if ($controller = 'eurecap') {
+		if ($controller == 'eurecap') {
 			VmModel::addIncludePath($this->_path . DS . 'models');
 
 			// TODO: Make sure the model exists. We probably should find a better way to load this automatically! 
diff --git a/eurecap.xml b/eurecap.xml
index f96e94750d68e6fce1250e2a84c097f198bc21f9..e29889ed97a500007cfd656c861112f9d7334724 100644
--- a/eurecap.xml
+++ b/eurecap.xml
@@ -7,7 +7,7 @@
     <authorUrl>http://www.open-tools.net/</authorUrl>
     <copyright>Copyright (C) 2015 Reinhold Kainhofer. All rights reserved.</copyright>
     <license>http://www.gnu.org/licenses/gpl-3.0.html GNU/GPLv3</license>
-    <version>0.1</version>
+    <version>0.3</version>
     <releaseDate>2015-04-01</releaseDate>
     <releaseType>Initial Release</releaseType>
     <downloadUrl>http://www.open-tools.net</downloadUrl>
@@ -38,7 +38,7 @@
                 <field name="countries" type="eucountries" multiple="true" scope="com_virtuemart" default="" label="VMEXT_EU_RECAP_COUNTRIES" description="VMEXT_EU_RECAP_COUNTRIES_DESC"/>
                 <field name="order_status" type="orderstatus" default="C,S" multiple="multiple" label="VMEXT_EU_RECAP_ORDERSTATUS" description="VMEXT_EU_RECAP_ORDERSTATUS_DESC "/>
                 <field name="shopper_groups" type="vmshoppergroups" multiple="multiple" label="VMEXT_EU_RECAP_SHOPPERGROUP" description="VMEXT_EU_RECAP_SHOPPERGROUP_DESC" />
-                <field name="vatid_userfield" type="vmuserfields" label="VMEXT_EU_RECAP_VATID_USERFIELD" multiple="multiple" default="opc_vat" description="VMEXT_EU_RECAP_VATID_USERFIELD_DESC" />
+                <field name="vatid_userfield" type="vmuserfields" label="VMEXT_EU_RECAP_VATID_USERFIELD" multiple="multiple" default="" description="VMEXT_EU_RECAP_VATID_USERFIELD_DESC" />
 <!--                <field name="include_taxed_orders" type="radio" default="0" class="btn-group btn-group-yesno" label="VMEXT_EU_RECAP_INCLUDE_TAXED" description="VMEXT_EU_RECAP_INCLUDE_TAXED_DESC" >
                     <option value="1">JYES</option>
                     <option value="0">JNO</option>
@@ -79,7 +79,7 @@
         <param type="vmjpluginwarning" />
         <param name="order_status" type="vmorderstates" default="C,S" multiple="multiple" label="VMEXT_EU_RECAP_ORDERSTATUS" description="VMEXT_EU_RECAP_ORDERSTATUS_DESC "/>
         <param name="shopper_groups" type="vmshoppergroups" multiple="multiple" label="VMEXT_EU_RECAP_SHOPPERGROUP" description="VMEXT_EU_RECAP_SHOPPERGROUP_DESC" />
-        <param name="vatid_userfield" type="vmuserfields" label="VMEXT_EU_RECAP_VATID_USERFIELD" multiple="multiple" default="opc_vat" description="VMEXT_EU_RECAP_VATID_USERFIELD_DESC" />
+        <param name="vatid_userfield" type="vmuserfields" label="VMEXT_EU_RECAP_VATID_USERFIELD" multiple="multiple" default="" description="VMEXT_EU_RECAP_VATID_USERFIELD_DESC" />
 <!--         <param name="include_taxed_orders" type="radio" default="0" class="btn-group btn-group-yesno" label="VMEXT_EU_RECAP_INCLUDE_TAXED" description="VMEXT_EU_RECAP_INCLUDE_TAXED_DESC" > 
             <option value="1">JYES</option>
             <option value="0">JNO</option>
diff --git a/fields/eucountries.php b/fields/eucountries.php
index f884064cf5947a40831db03c9c8d387f8bbd9929..58cc6a9b1b835325ca4531ae4947c67a0ab06127 100644
--- a/fields/eucountries.php
+++ b/fields/eucountries.php
@@ -2,30 +2,23 @@
 defined('_JEXEC') or die();
 
 /**
- *
- * @package    VirtueMart
- * @subpackage Plugins  - Elements
- * @author Valérie Isaksen, Adapted by Reinhold Kainhofer for EU countries
- * @link http://www.virtuemart.net
- * @copyright Copyright (c) 2004 - 2011 VirtueMart Team. All rights reserved.
- * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL, see LICENSE.php
- * VirtueMart is free software. This version may have been modified pursuant
- * to the GNU General Public License, and as distributed it includes or
- * is derivative of works licensed under the GNU General Public License or
- * other free or open source software licenses.
- * @version $Id: $
- */
+*
+* @package VirtueMart
+* @subpackage EU Recapitulative Statement
+* @copyright Copyright (C) 2015 Open Tools, Reinhold Kainhofer.
+* @license http://www.gnu.org/copyleft/gpl.html GNU/GPL, see LICENSE.txt
+* VirtueMart is free software. This version may have been modified pursuant
+* to the GNU General Public License, and as distributed it includes or
+* is derivative of works licensed under the GNU General Public License or
+* other free or open source software licenses.
+*
+* http://www.open-tools.net
+*/
 
 JFormHelper::loadFieldClass('list');
 jimport('joomla.form.formfield');
 
 class JFormFieldEUCountries extends JFormFieldList {
-
-	/**
-	 * Element name
-	 * @access    protected
-	 * @var        string
-	 */
 	var $type = 'euCountries';
 
 	protected function getInput() {
diff --git a/fields/index.html b/fields/index.html
new file mode 100644
index 0000000000000000000000000000000000000000..2efb97f319a35f6bd80f1751134ed71ec11888eb
--- /dev/null
+++ b/fields/index.html
@@ -0,0 +1 @@
+<!DOCTYPE html><title></title>
diff --git a/fields/vmshoppergroups.php b/fields/vmshoppergroups.php
index 7144974f1c997997b08deab7f8d8f9121f79019c..7e6c53590504f6a34c8c9300039a0600f1f5d63c 100644
--- a/fields/vmshoppergroups.php
+++ b/fields/vmshoppergroups.php
@@ -1,19 +1,19 @@
 <?php
 defined('_JEXEC') or die();
 /**
- *
- * @package    VirtueMart
- * @subpackage Plugins  - Elements
- * @author Valérie Isaksen
- * @link http://www.virtuemart.net
- * @copyright ${PHING.VM.COPYRIGHT}
- * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL, see LICENSE.php
- * VirtueMart is free software. This version may have been modified pursuant
- * to the GNU General Public License, and as distributed it includes or
- * is derivative of works licensed under the GNU General Public License or
- * other free or open source software licenses.
- * @version $Id$
- */
+*
+* @package VirtueMart
+* @subpackage EU Recapitulative Statement
+* @copyright Copyright (C) 2015 Open Tools, Reinhold Kainhofer.
+* @license http://www.gnu.org/copyleft/gpl.html GNU/GPL, see LICENSE.txt
+* VirtueMart is free software. This version may have been modified pursuant
+* to the GNU General Public License, and as distributed it includes or
+* is derivative of works licensed under the GNU General Public License or
+* other free or open source software licenses.
+*
+* http://www.open-tools.net
+*/
+
 JFormHelper::loadFieldClass('list');
 jimport('joomla.form.formfield');
 if (!class_exists( 'VmConfig' )) 
diff --git a/fields/vmuserfields.php b/fields/vmuserfields.php
index f80f5e7c3fd387fa314a5e2e929541909d52394c..2c858c272f22697065c3fa29b46da5df17053ab0 100644
--- a/fields/vmuserfields.php
+++ b/fields/vmuserfields.php
@@ -7,7 +7,7 @@ defined('_JEXEC') or die();
  * @author Reinhold Kainhofer, Open Tools
  * @link http://www.open-tools.net
  * @copyright Copyright (c) 2015 Reinhold Kainhofer. All rights reserved.
- * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL, see LICENSE.php
+ * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL, see LICENSE.txt
  * VirtueMart is free software. This version may have been modified pursuant
  * to the GNU General Public License, and as distributed it includes or
  * is derivative of works licensed under the GNU General Public License or
diff --git a/language/en-GB/index.html b/language/en-GB/index.html
new file mode 100644
index 0000000000000000000000000000000000000000..2efb97f319a35f6bd80f1751134ed71ec11888eb
--- /dev/null
+++ b/language/en-GB/index.html
@@ -0,0 +1 @@
+<!DOCTYPE html><title></title>
diff --git a/models/eurecap.php b/models/eurecap.php
index e84d87b9503bebaab66c76234beb8472758cdc1f..3a294d67426812e387e8860924ff9a79234c4be8 100644
--- a/models/eurecap.php
+++ b/models/eurecap.php
@@ -1,26 +1,19 @@
 <?php
-if (!defined ('_JEXEC')) {
-	die('Direct Access to ' . basename (__FILE__) . ' is not allowed.');
-}
+if (!defined ('_JEXEC')) die('Direct Access is not allowed.');
 
 /**
- *
- * EU Recapitulative Statement Model
- *
- * @author Reinhold Kainhofer
- * @version $Id$
- * @package VirtueMart
- * @subpackage EU Recapitulative Statement
- * @copyright Copyright (C) 2011 - 2014VirtueMart Team - All rights reserved.
- * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL, see LICENSE.php
- * VirtueMart is free software. This version may have been modified pursuant
- * to the GNU General Public License, and as distributed it includes or
- * is derivative of works licensed under the GNU General Public License or
- * other free or open source software licenses.
- * See /administrator/components/com_virtuemart/COPYRIGHT.php for copyright notices and details.
- *
- * http://www.open-tools.net
- */
+*
+* @package VirtueMart
+* @subpackage EU Recapitulative Statement
+* @copyright Copyright (C) 2015 Open Tools, Reinhold Kainhofer.
+* @license http://www.gnu.org/copyleft/gpl.html GNU/GPL, see LICENSE.txt
+* VirtueMart is free software. This version may have been modified pursuant
+* to the GNU General Public License, and as distributed it includes or
+* is derivative of works licensed under the GNU General Public License or
+* other free or open source software licenses.
+*
+* http://www.open-tools.net
+*/
 
 if (!class_exists ('VmModel')) {
 	require(VMPATH_ADMIN . DS . 'helpers' . DS . 'vmmodel.php');
@@ -74,7 +67,7 @@ class VirtuemartModelEuRecap extends VmModel {
 		$this->setFrequency($frequency);
 
 		$this->from = mktime(0,0,0, $month, 1, $year);
-		$this->until = strtotime('+'.$this->frequency.' months -1 day', $this->from);
+		$this->until = strtotime('+'.$this->frequency.' months -1 second', $this->from);
 
 		$this->from_date = date ('Y-m-d', $this->from);
 		$this->until_date = date ('Y-m-d', $this->until);
@@ -197,6 +190,7 @@ class VirtuemartModelEuRecap extends VmModel {
 		$whereString = 'WHERE ' . join(' AND ', $where);
 		$groupBy = "GROUP BY `vatid`";
 		$orderBy = $this->_getOrdering ();
+vmDebug("SQL: SELECT ".$selectString.$joinedTables.$whereString.$groupBy.$orderBy);
 
 		return $this->exeSortSearchListQuery (1, $selectString, $joinedTables, $whereString, $groupBy, $orderBy);
 	}
@@ -222,9 +216,9 @@ class VirtuemartModelEuRecap extends VmModel {
 
 			case 3: // quartely
 				$vals[1] = vmText::_('First Quarter');
-				$vals[3] = vmText::_('Second Quarter');
-				$vals[6] = vmText::_('Third Quarter');
-				$vals[9] = vmText::_('Forth Quarter');
+				$vals[4] = vmText::_('Second Quarter');
+				$vals[7] = vmText::_('Third Quarter');
+				$vals[10] = vmText::_('Forth Quarter');
 				break;
 
 			case 12: // yearly
diff --git a/models/eurecap_config.php b/models/eurecap_config.php
index e53a095c7c85020a75c3a7571998a2888b6ef8f2..18386dec079e38aaee853ad50b78f1ff057c5b33 100644
--- a/models/eurecap_config.php
+++ b/models/eurecap_config.php
@@ -1,26 +1,19 @@
 <?php
-if (!defined ('_JEXEC')) {
-	die('Direct Access to ' . basename (__FILE__) . ' is not allowed.');
-}
+if (!defined ('_JEXEC')) die('Direct Access to ' . basename (__FILE__) . ' is not allowed.');
 
 /**
- *
- * EU Recapitulative Statement Model
- *
- * @author Reinhold Kainhofer
- * @version $Id$
- * @package VirtueMart
- * @subpackage EU Recapitulative Statement
- * @copyright Copyright (C) 2011 - 2014VirtueMart Team - All rights reserved.
- * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL, see LICENSE.php
- * VirtueMart is free software. This version may have been modified pursuant
- * to the GNU General Public License, and as distributed it includes or
- * is derivative of works licensed under the GNU General Public License or
- * other free or open source software licenses.
- * See /administrator/components/com_virtuemart/COPYRIGHT.php for copyright notices and details.
- *
- * http://www.open-tools.net
- */
+*
+* @package VirtueMart
+* @subpackage EU Recapitulative Statement
+* @copyright Copyright (C) 2015 Open Tools, Reinhold Kainhofer.
+* @license http://www.gnu.org/copyleft/gpl.html GNU/GPL, see LICENSE.txt
+* VirtueMart is free software. This version may have been modified pursuant
+* to the GNU General Public License, and as distributed it includes or
+* is derivative of works licensed under the GNU General Public License or
+* other free or open source software licenses.
+*
+* http://www.open-tools.net
+*/
 
 if (!class_exists ('VmModel')) {
 	require(VMPATH_ADMIN . DS . 'helpers' . DS . 'vmmodel.php');
diff --git a/models/index.html b/models/index.html
new file mode 100644
index 0000000000000000000000000000000000000000..2efb97f319a35f6bd80f1751134ed71ec11888eb
--- /dev/null
+++ b/models/index.html
@@ -0,0 +1 @@
+<!DOCTYPE html><title></title>
diff --git a/releases/plg_vmextended_eurecap_v0.1.zip b/releases/plg_vmextended_eurecap_v0.1.zip
index 55a6bdb1477821a2a2a0a6fe0404ec1fa12959ca..ad4816125ce36690fef322ff8ffcf89c703affb7 100644
Binary files a/releases/plg_vmextended_eurecap_v0.1.zip and b/releases/plg_vmextended_eurecap_v0.1.zip differ
diff --git a/releases/plg_vmextended_eurecap_v0.2.zip b/releases/plg_vmextended_eurecap_v0.2.zip
new file mode 100644
index 0000000000000000000000000000000000000000..8d8f3f280235c6086055184d3919b7b3524c2d67
Binary files /dev/null and b/releases/plg_vmextended_eurecap_v0.2.zip differ
diff --git a/releases/plg_vmextended_eurecap_v0.3.zip b/releases/plg_vmextended_eurecap_v0.3.zip
new file mode 100644
index 0000000000000000000000000000000000000000..3775535f1b98d99997df4c0fbb3605f1f5a017a0
Binary files /dev/null and b/releases/plg_vmextended_eurecap_v0.3.zip differ
diff --git a/views/eurecap/tmpl/default.php b/views/eurecap/tmpl/default.php
index 71c21c15a1ae005d2c3721012d4a274a44a03293..1ea895cb0675210c6811369ca154dedebd295eb9 100644
--- a/views/eurecap/tmpl/default.php
+++ b/views/eurecap/tmpl/default.php
@@ -3,18 +3,16 @@ if( !defined( '_JEXEC' ) ) die( 'Direct Access to '.basename(__FILE__).' is not
 
 /**
 *
-* @version $Id$
 * @package VirtueMart
-* @subpackage Report
-* @copyright Copyright (C) VirtueMart Team - All rights reserved.
-* @license http://www.gnu.org/copyleft/gpl.html GNU/GPL, see LICENSE.php
+* @subpackage EU Recapitulative Statement
+* @copyright Copyright (C) 2015 Open Tools, Reinhold Kainhofer.
+* @license http://www.gnu.org/copyleft/gpl.html GNU/GPL, see LICENSE.txt
 * VirtueMart is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
 * is derivative of works licensed under the GNU General Public License or
 * other free or open source software licenses.
-* See /administrator/components/com_virtuemart/COPYRIGHT.php for copyright notices and details.
 *
-* http://virtuemart.org
+* http://www.open-tools.net
 */
 
 AdminUIHelper::startAdminArea($this);
diff --git a/views/eurecap/tmpl/export.php b/views/eurecap/tmpl/export.php
index 3ccd555b5241e84f7aadb43c563b60964355b21a..16365a6d5f41bc560b901f6e4b235b89c9ad4410 100644
--- a/views/eurecap/tmpl/export.php
+++ b/views/eurecap/tmpl/export.php
@@ -3,17 +3,16 @@ if( !defined( '_JEXEC' ) ) die( 'Direct Access to '.basename(__FILE__).' is not
 
 /**
 *
-* @version $Id$
 * @package VirtueMart
-* @subpackage Report
-* @copyright Copyright (C) Open Tools, Reinhold Kainhofer
-* @license http://www.gnu.org/copyleft/gpl.html GNU/GPL, see LICENSE.php
+* @subpackage EU Recapitulative Statement
+* @copyright Copyright (C) 2015 Open Tools, Reinhold Kainhofer.
+* @license http://www.gnu.org/copyleft/gpl.html GNU/GPL, see LICENSE.txt
 * VirtueMart is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
 * is derivative of works licensed under the GNU General Public License or
 * other free or open source software licenses.
 *
-* http://www.open-tools.net/
+* http://www.open-tools.net
 */
 
 // Load the sub-template as selected in the export format setting:
diff --git a/views/eurecap/tmpl/export_at_xml.php b/views/eurecap/tmpl/export_at_xml.php
index 2d51b62684ac7bd7fdc0c43f0b99155063483a03..3780078c9b4a7e8c750368072309ff9651829b09 100644
--- a/views/eurecap/tmpl/export_at_xml.php
+++ b/views/eurecap/tmpl/export_at_xml.php
@@ -3,17 +3,16 @@ if( !defined( '_JEXEC' ) ) die( 'Direct Access to '.basename(__FILE__).' is not
 
 /**
 *
-* @version $Id$
 * @package VirtueMart
-* @subpackage Report
-* @copyright Copyright (C) Open Tools, Reinhold Kainhofer
-* @license http://www.gnu.org/copyleft/gpl.html GNU/GPL, see LICENSE.php
+* @subpackage EU Recapitulative Statement
+* @copyright Copyright (C) 2015 Open Tools, Reinhold Kainhofer.
+* @license http://www.gnu.org/copyleft/gpl.html GNU/GPL, see LICENSE.txt
 * VirtueMart is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
 * is derivative of works licensed under the GNU General Public License or
 * other free or open source software licenses.
 *
-* http://www.open-tools.net/
+* http://www.open-tools.net
 */
 
 $from_month=date("Y-m", $this->from);
diff --git a/views/eurecap/tmpl/export_de_csv.php b/views/eurecap/tmpl/export_de_csv.php
index 5c35ee7fec6f220bdcd4579bf8ad9146ec42ad83..cab292b7a7a3a50c9a0636bfd5265ee1a5f3583d 100644
--- a/views/eurecap/tmpl/export_de_csv.php
+++ b/views/eurecap/tmpl/export_de_csv.php
@@ -3,17 +3,16 @@ if( !defined( '_JEXEC' ) ) die( 'Direct Access to '.basename(__FILE__).' is not
 
 /**
 *
-* @version $Id$
 * @package VirtueMart
-* @subpackage Report
-* @copyright Copyright (C) Open Tools, Reinhold Kainhofer
-* @license http://www.gnu.org/copyleft/gpl.html GNU/GPL, see LICENSE.php
+* @subpackage EU Recapitulative Statement
+* @copyright Copyright (C) 2015 Open Tools, Reinhold Kainhofer.
+* @license http://www.gnu.org/copyleft/gpl.html GNU/GPL, see LICENSE.txt
 * VirtueMart is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
 * is derivative of works licensed under the GNU General Public License or
 * other free or open source software licenses.
 *
-* http://www.open-tools.net/
+* http://www.open-tools.net
 */
 
 $from_month=date("Y-m", $this->from);
diff --git a/views/eurecap/tmpl/export_full.php b/views/eurecap/tmpl/export_full.php
index dc7e209a9f31e5413278fc373f3966ce44eda121..d659b41157ba118958d8b9ad207f5db59008a4a4 100644
--- a/views/eurecap/tmpl/export_full.php
+++ b/views/eurecap/tmpl/export_full.php
@@ -3,17 +3,16 @@ if( !defined( '_JEXEC' ) ) die( 'Direct Access to '.basename(__FILE__).' is not
 
 /**
 *
-* @version $Id$
 * @package VirtueMart
-* @subpackage Report
-* @copyright Copyright (C) Open Tools, Reinhold Kainhofer
-* @license http://www.gnu.org/copyleft/gpl.html GNU/GPL, see LICENSE.php
+* @subpackage EU Recapitulative Statement
+* @copyright Copyright (C) 2015 Open Tools, Reinhold Kainhofer.
+* @license http://www.gnu.org/copyleft/gpl.html GNU/GPL, see LICENSE.txt
 * VirtueMart is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
 * is derivative of works licensed under the GNU General Public License or
 * other free or open source software licenses.
 *
-* http://www.open-tools.net/
+* http://www.open-tools.net
 */
 
 $from_month=date("Y-m", $this->from);
diff --git a/views/eurecap/tmpl/settings.php b/views/eurecap/tmpl/settings.php
index 66974ccfbd8842b971472909f83869779d981759..2863e29a19e40474592fad330572e2e62d78958d 100644
--- a/views/eurecap/tmpl/settings.php
+++ b/views/eurecap/tmpl/settings.php
@@ -3,18 +3,16 @@ if( !defined( '_JEXEC' ) ) die( 'Direct Access to '.basename(__FILE__).' is not
 
 /**
 *
-* @version $Id$
 * @package VirtueMart
 * @subpackage EU Recapitulative Statement
-* @copyright Copyright (C) 2015 Open Tools, Reinhold Kainhofer
-* @license http://www.gnu.org/copyleft/gpl.html GNU/GPL, see LICENSE.php
+* @copyright Copyright (C) 2015 Open Tools, Reinhold Kainhofer.
+* @license http://www.gnu.org/copyleft/gpl.html GNU/GPL, see LICENSE.txt
 * VirtueMart is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
 * is derivative of works licensed under the GNU General Public License or
 * other free or open source software licenses.
-* See /administrator/components/com_virtuemart/COPYRIGHT.php for copyright notices and details.
 *
-* http://www.open-tools.net/
+* http://www.open-tools.net
 */
 
 AdminUIHelper::startAdminArea($this);
diff --git a/views/eurecap/view.html.php b/views/eurecap/view.html.php
index fe766b8c3e79cd85b0e2dff8b6e291e73c962221..75af80cc1edab31d9c6cd7f47f16fe7a43b44fe0 100644
--- a/views/eurecap/view.html.php
+++ b/views/eurecap/view.html.php
@@ -3,19 +3,16 @@ if( !defined( '_JEXEC' ) ) die('Restricted access');
 
 /**
 *
-* @version $Id$
 * @package VirtueMart
 * @subpackage EU Recapitulative Statement
-* Based in parts on VirtueMart's "Revenue Report"
-* @copyright Copyright (C) VirtueMart Team - All rights reserved.
-* @license http://www.gnu.org/copyleft/gpl.html GNU/GPL, see LICENSE.php
+* @copyright Copyright (C) 2015 Open Tools, Reinhold Kainhofer.
+* @license http://www.gnu.org/copyleft/gpl.html GNU/GPL, see LICENSE.txt
 * VirtueMart is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
 * is derivative of works licensed under the GNU General Public License or
 * other free or open source software licenses.
-* See /administrator/components/com_virtuemart/COPYRIGHT.php for copyright notices and details.
 *
-* http://virtuemart.org
+* http://www.open-tools.net
 */
 
 if(!defined('VM_VERSION') or VM_VERSION < 3){
@@ -118,7 +115,7 @@ class VirtuemartViewEuRecap extends VmViewAdmin {
 		JToolBarHelper::custom('settings', 'options', 'options','VMEXT_EU_RECAP_SETTINGS', false);
 // 		JToolBarHelper::custom('check_eu_vatid', 'recheck', 'recheck', 'VMEXT_EU_RECAP_RECHECK_EUVATID', true);
 // 		$bar->appendButton('Link', 'export', 'VMEXT_EU_RECAP_FULLEXPORT', 'index.php?option=com_virtuemart&view=eurecap&task=export&format=raw&layout=export_full&month='.$month.'&year='.$year);
-		$bar->appendButton('Link', 'export', 'VMEXT_EU_RECAP_EXPORT_TB_' . $settings['export_format'], 'index.php?option=com_virtuemart&view=eurecap&task=export&format=raw&layout=export&month='.$month.'&year='.$year);
+// 		$bar->appendButton('Link', 'export', 'VMEXT_EU_RECAP_EXPORT_TB_' . $settings['export_format'], 'index.php?option=com_virtuemart&view=eurecap&task=export&format=raw&layout=export&month='.$month.'&year='.$year);
 
 		$user = JFactory::getUser();
 		if($user->authorise('core.admin', 'com_virtuemart') or $user->authorise('core.manager', 'com_virtuemart')){
@@ -149,7 +146,7 @@ class VirtuemartViewEuRecap extends VmViewAdmin {
 		$euIntracommunityRevenue = $model->getEuRecap();
 		$this->assignRef('report', $euIntracommunityRevenue);
 
-		$this->export_format_list = $model->renderExportFormatList($this->_path['template'], $settings['export_format']);
+		$this->export_format_list = $model->renderExportFormatList($this->_path['template'], isset($settings['export_format'])?$settings['export_format']:"full");
 // 		$this->assignRef('export_format', $settings['export_format']);
 
 		$pagination = $model->getPagination();
diff --git a/views/eurecap/view.raw.php b/views/eurecap/view.raw.php
index e17ccbb9b88d1a2a20220e5fad25b551a936cce6..9d1006c2ed65777458290b6d90c280187355b711 100644
--- a/views/eurecap/view.raw.php
+++ b/views/eurecap/view.raw.php
@@ -3,15 +3,16 @@ if( !defined( '_JEXEC' ) ) die('Restricted access');
 
 /**
 *
-* @version $Id$
 * @package VirtueMart
 * @subpackage EU Recapitulative Statement
-* @copyright Copyright (C) Open Tools, Reinhold Kainhofer
-* @license http://www.gnu.org/copyleft/gpl.html GNU/GPL, see LICENSE.php
+* @copyright Copyright (C) 2015 Open Tools, Reinhold Kainhofer.
+* @license http://www.gnu.org/copyleft/gpl.html GNU/GPL, see LICENSE.txt
 * VirtueMart is free software. This version may have been modified pursuant
 * to the GNU General Public License, and as distributed it includes or
 * is derivative of works licensed under the GNU General Public License or
 * other free or open source software licenses.
+*
+* http://www.open-tools.net
 */
 
 if(!defined('VM_VERSION') or VM_VERSION < 3){
diff --git a/views/index.html b/views/index.html
new file mode 100644
index 0000000000000000000000000000000000000000..2efb97f319a35f6bd80f1751134ed71ec11888eb
--- /dev/null
+++ b/views/index.html
@@ -0,0 +1 @@
+<!DOCTYPE html><title></title>