diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3b8678df3bacb8dfafa0bd77a4c4ff9406ad3568..2fbf777645b16c045de8f588f2fa3088693d4518 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,9 +1,11 @@
 PROJECT(WCCL)
 cmake_minimum_required(VERSION 2.8.0)
 
-set(ver_major "0")
-set(ver_minor "0")
-set(ver_patch "3")
+set(wccl_ver_major "0")
+set(wccl_ver_minor "1")
+set(wccl_ver_patch "3")
+
+set(LIBWCCL_VERSION "${wccl_ver_major}.${wccl_ver_minor}.${wccl_ver_patch}")
 
 # use some of our own Find* scripts
 set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/CMakeScripts)
@@ -47,8 +49,6 @@ endif(CMAKE_COMPILER_IS_GNUCXX)
 set(LIBS "")
 include_directories(${WCCL_SOURCE_DIR})
 
-set(LIBWCCL_VERSION "${ver_major}.${ver_minor}.${ver_patch}")
-
 find_package(Boost 1.41 REQUIRED COMPONENTS program_options system filesystem regex)
 
 if(MSVC OR BORLAND)
diff --git a/COPYING b/COPYING
new file mode 100644
index 0000000000000000000000000000000000000000..94a9ed024d3859793618152ea559a168bbcbb5e2
--- /dev/null
+++ b/COPYING
@@ -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/LICENSE b/LICENSE
new file mode 100644
index 0000000000000000000000000000000000000000..146bacdb2a1690dc2234c9a6348efbb7677c4d3e
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,23 @@
+    Copyright (C) 2010-2011 Adam Wardyński, Tomasz Śniatowski, Paweł Kędzia,
+Adam Radziszewski, Bartosz Broda
+
+    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>.
+
+    Additional permission under GNU GPL version 3 section 7
+
+    If you modify this Program, or any covered work, by linking or combining
+it with Morfeusz (or a modified version of that library),
+containing parts covered by the terms of the Morfeusz license, the
+licensors of this Program grant you additional permission to convey the
+resulting work. 
diff --git a/LICENSE.in b/LICENSE.in
new file mode 100644
index 0000000000000000000000000000000000000000..64c3259934d358c96c2009c2e69011c735722461
--- /dev/null
+++ b/LICENSE.in
@@ -0,0 +1,17 @@
+/*
+    Copyright (C) 2011 Adam Wardyński, Tomasz Śniatowski, Paweł Kędzia,
+    Adam Radziszewski, Bartosz Broda
+    Part of the WCCL project
+
+    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 LICENSE and COPYING files for more details.
+*/
+
diff --git a/doc/wccl-rules.py b/doc/wccl-rules.py
new file mode 100755
index 0000000000000000000000000000000000000000..2b239b61bb227fb395c2e753f3fb426d1352435f
--- /dev/null
+++ b/doc/wccl-rules.py
@@ -0,0 +1,178 @@
+#!/usr/bin/python
+# -*- coding: utf-8 -*-
+import sys
+from optparse import OptionParser
+
+# There is some bug in SWIG appearing when using two SWIG-wrapped libraries
+# simultaneously. The bug manifests itself in throwing unwrapped
+# swig::stop_iteration exceptions when iterating over C++ collections
+# (e.g. iterating over sentence tokens).
+# The lines below may be necessary to work around this bug. Consider adding
+# them before importing corpus2 and wccl in your code.
+import ctypes
+sys.setdlopenflags(sys.getdlopenflags() | ctypes.RTLD_GLOBAL)
+import corpus2, wccl
+
+# helper string containing input/output formats available in corpus2
+format_help = """
+Available input formats: """ + ' '.join(corpus2.TokenReader.available_reader_types()) + """
+""" + ' '.join(corpus2.TokenReader.available_reader_types_help()) + """
+Available output formats: """ + ' '.join(corpus2.TokenWriter.available_writer_types()) + """
+""" + ' '.join(corpus2.TokenWriter.available_writer_types_help())
+
+descr = """%prog [options] WCCLFILE
+Mimics (simplified) functionality of wccl-rules.
+This script is a demo of the Python API.
+
+NOTE: if you want to fire match rules, you should use one of those options:
+* use a format dedicated for annotations (ccl or iob-chan) or
+* use any other format but pass an 'ann' option to input spec (e.g. xces,ann)
+
+If you use raw 'xces' (or 'plain' etc.), the code will try to wrap the sentence
+as AnnotatedSentence anyway, but the original sentence object may still be not
+updated -- that is the changes made by the rules may be not present in the
+output when using the writer to write the original object (if the object has
+already been an AnnotatedSentence, the wrapper function will return itself
+intact).
+
+Example usage:
+doc/wccl-rules.py examples/simple-match.ccl -i xces,ann -o ccl < examples/in-xces.xml
+
+To see annotation manipulation with Python:
+doc/wccl-rules.py -A examples/simple-match.ccl -i xces,ann -o none < examples/in-xces.xml
+
+""" + format_help
+
+def get_reader(in_path, tagset, input_format):
+	"""Creates a reader using the options. If in_path evaluates to False,
+	will create a stdin reader."""
+	if in_path:
+		return corpus2.TokenReader.create_path_reader(
+			input_format, tagset, in_path)
+	else:
+		return corpus2.TokenReader.create_stdin_reader(input_format, tagset)
+
+def get_writer(out_path, tagset, output_format):
+	"""Creates a writer using the options. If out_path evaluates to False,
+	will create a stdout writer."""
+	if out_path:
+		return corpus2.TokenWriter.create_path_writer(output_format, out_path,
+			tagset)
+	else:
+		return corpus2.TokenWriter.create_stdout_writer(output_format, tagset)
+
+def process_sent(asent, wccl_file, shall_print_ann_info):
+	if wccl_file.has_tag_rules():
+		tag_rules = wccl_file.get_tag_rules_ptr()
+		tag_rules.execute_once(asent)
+	if wccl_file.has_match_rules():
+		match_rules = wccl_file.get_match_rules_ptr()
+		match_rules.apply_all(asent)
+	if shall_print_ann_info:
+		print '####', ' '.join(tok.orth_utf8() for tok in asent.tokens())
+		print asent.annotation_info()
+		for chan_name in asent.all_channels():
+			chan = asent.get_channel(chan_name)
+			# get the internal representation -- annotation id vector
+			print chan_name, '\t', chan.dump_segments()
+			# if you want to get it as a int vector, use chan.segments()
+			# or to get one it at idx -- chan.get_segment_at(idx)
+			# 0 means no annot there, positive values==ann indices
+			
+			# now iterate over annotations as whole segments
+			ann_vec = chan.make_annotation_vector()
+			for ann in ann_vec:
+				idx_text = ','.join(str(idx) for idx in ann.indices)
+				orth_text = ' '.join(asent.tokens()[idx].orth_utf8() for idx in ann.indices)
+				print '\t%s\t%s\t(%s)' % (chan_name, idx_text, orth_text)
+
+
+def go():
+	parser = OptionParser(usage=descr)
+	parser.add_option('-t', '--tagset', type='string', action='store',
+		dest='tagset', default='kipi',
+		help='set the tagset used in input; default: kipi')
+	parser.add_option('-i', '--input-format', type='string', action='store',
+		dest='input_format', default='xces',
+		help='set the input format; default: xces')
+	parser.add_option('-o', '--output-format', type='string', action='store',
+		dest='output_format', default='xces',
+		help='set the output format; default: xces')
+	parser.add_option('-I', '--input-file', type='string', action='store',
+		dest='in_path', default='',
+		help='set input filename (do not read from stdin)')
+	parser.add_option('-O', '--output-file', type='string', action='store',
+		dest='out_path', default='',
+		help='set output filename (do not write to stdout)')
+	parser.add_option('-C', '--chunks', action='store_true',
+		dest='preserve_chunks', default=False,
+		help='preserve input paragraph chunks (the default is to read sentences only)')
+	parser.add_option('-D', '--lex-dir', type='string', action='store',
+		dest='lex_dir', default='.',
+		help='use the given directory to look for lexicon files (default: .)')
+	parser.add_option('-A', '--ann-info', action='store_true',
+		dest='ann_info', default=False,
+		help='print annotation info')
+	
+	(options, args) = parser.parse_args()
+	
+	if len(args) != 1:
+		sys.stderr.write('You need to provide a WCCL file.\n')
+		sys.stderr.write('See %s --help\n' % sys.argv[0])
+		sys.exit(1)
+	
+	wccl_path = args[0]
+	
+	# create a tagset object for all subsequent processing
+	# when reading input corpus, when creating new tags/tokens and when
+	# creating a WCCL parser it must be specified what tagset is being used
+	tagset = corpus2.get_named_tagset(options.tagset)
+	
+	# now instantiate a WCCL parser and parse the provided WCCL file
+	# lex_dir is optional -- if the WCCL code references external
+	# lexicons, they will be sought in the given search path
+	# (defaults to '.')
+	p = wccl.Parser(tagset)
+	wccl_file = p.parseWcclFileFromPath(wccl_path, options.lex_dir)
+	# check if there are any rules in the parsed WCCL file
+	if not wccl_file.has_tag_rules() and not wccl_file.has_match_rules():
+		sys.stderr.write('The given WCCL file contains no rules.\n')
+		sys.exit(1)
+	
+	# create a corpus2 reader using the given input format specs
+	# (e.g. xces,flat), tagset name
+	# if options.in_path is empty, will create an stdin reader
+	reader = get_reader(options.in_path, tagset, options.input_format)
+	# create a corpus2 writer -- will be used to write the processed corpus
+	writer = get_writer(options.out_path, tagset, options.output_format)
+	
+	# processing paragraph-by-paragraph
+	if options.preserve_chunks:
+		while True:
+			chunk = reader.get_next_chunk()
+			if not chunk:
+				break # end of input
+			# process each sentence separately
+			for sent in chunk.sentences():
+				# wrap the sentence as an AnnotatedSentence
+				asent = corpus2.AnnotatedSentence.wrap_sentence(sent)
+				process_sent(sent, wccl_file, options.ann_info)
+			# save processed chunk
+			# NOTE: if the input sent was not AnnotatedSentence, the changes
+			# will be discarded
+			writer.write_chunk(chunk)
+	else:
+		while True:
+			sent = reader.get_next_sentence()
+			if not sent:
+				break # end of input
+			# wrap the sentence as an AnnotatedSentence
+			asent = corpus2.AnnotatedSentence.wrap_sentence(sent)
+			process_sent(asent, wccl_file, options.ann_info)
+			# save processed sentence (safe)
+			# NOTE: if the input sent was not AnnotatedSentence, the changes
+			# will be discarded
+			writer.write_sentence(sent)
+
+if __name__ == '__main__':
+	go()
diff --git a/examples/simple-match.ccl b/examples/simple-match.ccl
new file mode 100644
index 0000000000000000000000000000000000000000..fbac352a51e91292acbc185965d5e70ae25dcb5b
--- /dev/null
+++ b/examples/simple-match.ccl
@@ -0,0 +1,24 @@
+match_rules(
+	apply(
+		match(
+			optional(equal(base[0], "nie")),
+			repeat(
+				inter(class[0], {adj, ppas, pact})
+			)
+		),
+		actions(
+			mark(M, "AdjP")
+		)
+	);
+ 
+	apply(
+		match(
+			optional(is("AdjP")),
+			inter(class[0], {subst, ger, depr})
+		),
+		actions(
+			mark(M, M, :2, "NP")
+		)
+	)
+)
+
diff --git a/libmwereader/mwe.cpp b/libmwereader/mwe.cpp
index 8db796cc39e18bcb871007a0407af8d7c9f0edb5..19e794872e565488322236728c313f27321d9b7e 100644
--- a/libmwereader/mwe.cpp
+++ b/libmwereader/mwe.cpp
@@ -1,3 +1,20 @@
+/*
+    Copyright (C) 2011 Adam Wardyński, Tomasz Śniatowski, Paweł Kędzia,
+    Adam Radziszewski, Bartosz Broda
+    Part of the WCCL project
+
+    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 LICENSE and COPYING files for more details.
+*/
+
 #include "mwe.h"
 #include <boost/algorithm/string.hpp>
 #include <libwccl/values/strset.h>
@@ -70,7 +87,8 @@ bool LexicalUnit::IsHere(const Wccl::SentenceContext &sc,
 	if(!found_head){
 		std::string errmsg("MWE found, but no head for it.");
 		errmsg += " Offending unit: " + base_;
-		throw Wccl::WcclError(errmsg);
+		//throw Wccl::WcclError(errmsg);
+		return false;
 	}
 
 	return true;
diff --git a/libmwereader/mwe.h b/libmwereader/mwe.h
index 0fec3e0e2f8be3172f75b87fa84aa9d927235458..903bc175a4f30522fe16ed0847b8e65a0b92638f 100644
--- a/libmwereader/mwe.h
+++ b/libmwereader/mwe.h
@@ -1,3 +1,20 @@
+/*
+    Copyright (C) 2011 Adam Wardyński, Tomasz Śniatowski, Paweł Kędzia,
+    Adam Radziszewski, Bartosz Broda
+    Part of the WCCL project
+
+    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 LICENSE and COPYING files for more details.
+*/
+
 #ifndef LIBMWEREADER_MWE_H
 #define LIBMWEREADER_MWE_H
 
diff --git a/libmwereader/mweparser.cpp b/libmwereader/mweparser.cpp
index c4453f140b011f2131fcb02dbff16a106ad1e46d..6ab3f5e210527936afb2bfcca364e39efba81117 100644
--- a/libmwereader/mweparser.cpp
+++ b/libmwereader/mweparser.cpp
@@ -1,3 +1,20 @@
+/*
+    Copyright (C) 2011 Adam Wardyński, Tomasz Śniatowski, Paweł Kędzia,
+    Adam Radziszewski, Bartosz Broda
+    Part of the WCCL project
+
+    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 LICENSE and COPYING files for more details.
+*/
+
 #include "mweparser.h"
 
 #include <libpwrutils/foreach.h>
@@ -111,9 +128,7 @@ namespace Corpus2 {
 	void MWEParser::on_start_element(const Glib::ustring &name,
 			const AttributeList& attributes)
 	{
-		std::cout << "about to check" << std::endl;
-		std::cout << state_ << ": " << name << std::endl;
-		std::cout << "done with check" << std::endl;
+		//std::cout << state_ << ": " << name << std::endl;
 		if(state_ == NONE && name == "units_description"){
 			tagset_ = get_attribute(attributes, "tagset");
 			mwe_builder_ = boost::shared_ptr<MWEBuilder>(new MWEBuilder(Corpus2::get_named_tagset(tagset_)));
diff --git a/libmwereader/mweparser.h b/libmwereader/mweparser.h
index bb382287f58c1c9447ac6ecfa0a7336985c70428..c42df372759cb445e69e5672a4ddf47ca2e54953 100644
--- a/libmwereader/mweparser.h
+++ b/libmwereader/mweparser.h
@@ -1,3 +1,20 @@
+/*
+    Copyright (C) 2011 Adam Wardyński, Tomasz Śniatowski, Paweł Kędzia,
+    Adam Radziszewski, Bartosz Broda
+    Part of the WCCL project
+
+    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 LICENSE and COPYING files for more details.
+*/
+
 #ifndef LIBMWEREADER_MWEPARSER_H
 #define LIBMWEREADER_MWEPARSER_H
 
diff --git a/libmwereader/mwereader.cpp b/libmwereader/mwereader.cpp
index c7aa4a37e78fe438dd872cda160010a40561869e..f09e5352e74e8f8f040322c9fa5e3060057981f9 100644
--- a/libmwereader/mwereader.cpp
+++ b/libmwereader/mwereader.cpp
@@ -1,6 +1,24 @@
+/*
+    Copyright (C) 2011 Adam Wardyński, Tomasz Śniatowski, Paweł Kędzia,
+    Adam Radziszewski, Bartosz Broda
+    Part of the WCCL project
+
+    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 LICENSE and COPYING files for more details.
+*/
+
 #include "mwereader.h"
 #include "mweparser.h"
 #include <boost/algorithm/string.hpp>
+#include <boost/filesystem.hpp>
 
 
 namespace Corpus2{
@@ -11,7 +29,7 @@ bool MWEReader::registered = TokenReader::register_path_reader<MWEReader>(
 	MWEReader::MWEReader(const Tagset &tagset, const std::string &filename)
 		: TokenReader(tagset), inner_filename_(filename)
 	{
-		// TODO implementataion?
+		mwes_counter=0;
 	}
 
 	MWEReader::~MWEReader()
@@ -21,30 +39,58 @@ bool MWEReader::registered = TokenReader::register_path_reader<MWEReader>(
 
 	Token* MWEReader::get_next_token()
 	{
-		// TODO MWE stuff
-		// get whole sentence -> process it -> return token by token
-		return inner_reader_->get_next_token();
+		if(currentSentence->empty())
+			currentSentence=get_next_sentence();
+
+		std::vector<Token*> tokens = currentSentence->tokens();
+		if(token_index<tokens.size())
+		{
+			return tokens.at(token_index++);
+		}
+		else
+		{
+
+			currentSentence=get_next_sentence();
+
+
+			if(currentSentence==NULL)
+			{
+				return NULL;
+			}
+			tokens = currentSentence->tokens();
+			token_index=0;
+			return tokens.at(token_index++);
+		}
 	}
 
 	Sentence::Ptr MWEReader::get_next_sentence()
 	{
-		// TODO MWE stuff
-		Sentence::Ptr pSentence = inner_reader_->get_next_sentence();
-		if(pSentence == NULL)
-			return Sentence::Ptr();
-		Wccl::SentenceContext sc(pSentence);
+		currentSentence = inner_reader_->get_next_sentence();
+		if(currentSentence==0)
+		{
+			return currentSentence;
+		}
+		Wccl::SentenceContext sc(currentSentence);
+		token_index=0;
 		return process_sentence(sc);
-
 	}
 
 	Sentence::Ptr MWEReader::process_sentence(Wccl::SentenceContext & sc)
 	{
 
-		for(int i = 0; i < sc.size(); ++i){
+		size_t sssize = sc.size();
+		for(int i = 0; i < sc.size() ;++i){
 			sc.set_position(i);
 			Corpus2::Token *pToken = sc.at(i);
+			//std::cout << "AAAAAAAAAAA" << i << " ---- " << sc.size()  << std::endl;
+			//if(!pToken)
+				//continue;
 			//std::cout << pToken->orth_utf8() << " ";
 			std::vector<Lexeme>& lexemes = pToken->lexemes();
+			if(!lexemes.size()){
+				sssize = sc.size();
+				continue;
+			}
 			foreach(const Lexeme& lex, lexemes){
 				if(lex.is_disamb()){
 					std::string base = lex.lemma_utf8();
@@ -61,14 +107,21 @@ bool MWEReader::registered = TokenReader::register_path_reader<MWEReader>(
 							Corpus2::Sentence::Ptr sent = sc.get_sentence_ptr();
 
 							std::vector<Token*> &tokens = sent->tokens();
+							int orig_i = i;
 							foreach(const int &pos, positions){
 								Token* tok = tokens [pos];
 								new_orth_utf8 += tok->orth_utf8() + " ";
 								if(pos != head){
 									delete tok;
 									tokens[pos] = NULL;
-									if(pos >= i)
+									//std::cout << "BBBB " << pos  << " " << i << std::endl;
+
+									if(orig_i > pos)
+									{
 										i--;
+										std::cout << "\nTUTUXXXXXX\n";
+									}
+									//std::cout << "XBBBB " << pos  << " " << i << std::endl;
 								}
 							}
 							new_orth_utf8.erase(new_orth_utf8.size()-1, 1);
@@ -84,6 +137,7 @@ bool MWEReader::registered = TokenReader::register_path_reader<MWEReader>(
 					}
 				}
 			}
+			sssize = sc.size();
 		}
 
 
@@ -92,9 +146,21 @@ bool MWEReader::registered = TokenReader::register_path_reader<MWEReader>(
 
 	boost::shared_ptr<Chunk> MWEReader::get_next_chunk()
 	{
-		// TODO MWE stuff
-		// get whole chunk -> process sentences -> return processed chunk
-		return inner_reader_->get_next_chunk();
+		currentChunk=inner_reader_->get_next_chunk();
+		if(currentChunk == NULL)
+			return currentChunk;
+		std::vector< boost::shared_ptr<Corpus2::Sentence> > s1 = currentChunk->sentences();
+		std::vector< boost::shared_ptr<Corpus2::Sentence> >::iterator it;
+		for(it=s1.begin(); it!=s1.end(); it++)
+		{
+			if(it==s1.begin())
+				currentSentence=*it;
+			Wccl::SentenceContext sc(*it);
+			process_sentence(sc);
+		}
+
+		token_index=0;
+		return currentChunk;
 	}
 
 	void MWEReader::set_option(const std::string& option)
@@ -104,10 +170,34 @@ bool MWEReader::registered = TokenReader::register_path_reader<MWEReader>(
 			std::string inner = option.substr(6);
 			inner_reader_ = create_path_reader(inner, this->tagset(),
 											inner_filename_);
+			token_index=0;
+			currentSentence= boost::make_shared<Sentence>();
 		}
 		if(boost::algorithm::starts_with(option, "mwefile:")) {
+
 			std::string mwefile = option.substr(8);
-			load_mwes(mwefile);
+			if(boost::filesystem::exists(mwefile))
+				load_mwes(mwefile);
+			else
+				throw std::runtime_error("File "+ mwefile + " does not exists");
+		}
+		if(boost::algorithm::starts_with(option, "mwefile-list:")) {
+			std::string mwefile = option.substr(13);
+			size_t found=mwefile.find(" ",0);
+			while(found!=std::string::npos)
+			{
+				std::string file = mwefile.substr(0,found);
+				if(boost::filesystem::exists(file))
+					load_mwes(file);
+				else
+					throw std::runtime_error("File "+ mwefile +" does not exists");
+				mwefile=mwefile.substr(found+1);
+				found=mwefile.find(" ",0);
+			}
+			if(boost::filesystem::exists(mwefile))
+				load_mwes(mwefile);
+			else
+				throw std::runtime_error("File "+ mwefile +" does not exists");
 		}
 
 
@@ -116,8 +206,11 @@ bool MWEReader::registered = TokenReader::register_path_reader<MWEReader>(
 
 	void MWEReader::validate()
 	{
+		
 		if(inner_reader_ == NULL)
 			throw Corpus2Error("Inner reader not initialised.");
+		if(mwes_counter==0)
+			throw Corpus2Error("MWE files were not loaded");
 		// TODO MWE stuff
 	}
 
@@ -134,6 +227,7 @@ bool MWEReader::registered = TokenReader::register_path_reader<MWEReader>(
 	{
 		MWEParser parser(mwe_index_);
 		parser.parse_file(filename);
+		mwes_counter++;
 
 	}
 
diff --git a/libmwereader/mwereader.h b/libmwereader/mwereader.h
index 61d9c52859a6649fb4158951cf6d76e4362ca97c..9290c2e7ad9856c672f428393da2c89ff2b00151 100644
--- a/libmwereader/mwereader.h
+++ b/libmwereader/mwereader.h
@@ -1,3 +1,20 @@
+/*
+    Copyright (C) 2011 Adam Wardyński, Tomasz Śniatowski, Paweł Kędzia,
+    Adam Radziszewski, Bartosz Broda
+    Part of the WCCL project
+
+    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 LICENSE and COPYING files for more details.
+*/
+
 #ifndef LIBMWEREADER_MWEREADER_H
 #define LIBMWEREADER_MWEREADER_H
 
@@ -62,6 +79,13 @@ private:
 	/// path for inner reader
 	std::string inner_filename_;
 	/// inner reader option
+	size_t token_index;
+	/// contains last processed sentence
+	Sentence::Ptr currentSentence;
+	/// contains last processed chunk
+	boost::shared_ptr<Chunk> currentChunk;
+	/// quantity of loaded mwes files
+	size_t mwes_counter;
 };
 
 } // ns Corpus2
diff --git a/libmwereader/mwertest.cpp b/libmwereader/mwertest.cpp
index 3265fadd9499fc404b4aa0c7a8a01b1d56bc5c78..acdf432746445d3ca0171da568a587497f4dd08a 100644
--- a/libmwereader/mwertest.cpp
+++ b/libmwereader/mwertest.cpp
@@ -1,3 +1,20 @@
+/*
+    Copyright (C) 2011 Adam Wardyński, Tomasz Śniatowski, Paweł Kędzia,
+    Adam Radziszewski, Bartosz Broda
+    Part of the WCCL project
+
+    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 LICENSE and COPYING files for more details.
+*/
+
 #include <iostream>
 
 #include "mweparser.h"
diff --git a/libmwereader/tests/main.cpp b/libmwereader/tests/main.cpp
index 5b9f6271d293a10727a32290c578483fbbafb288..e60783468cab30eb82079f452a6c5430928b5a92 100644
--- a/libmwereader/tests/main.cpp
+++ b/libmwereader/tests/main.cpp
@@ -1,3 +1,20 @@
+/*
+    Copyright (C) 2011 Adam Wardyński, Tomasz Śniatowski, Paweł Kędzia,
+    Adam Radziszewski, Bartosz Broda
+    Part of the WCCL project
+
+    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 LICENSE and COPYING files for more details.
+*/
+
 #define BOOST_TEST_MODULE master
 #include <boost/test/included/unit_test.hpp>
 #include <boost/test/included/unit_test_framework.hpp>
diff --git a/libmwereader/tests/mwe.cpp b/libmwereader/tests/mwe.cpp
index 881bb754c97663a3b3a313f19aecd0b3994b47b4..92ce05520beea0fabc3d67b9ee9e3524d48e6ec1 100644
--- a/libmwereader/tests/mwe.cpp
+++ b/libmwereader/tests/mwe.cpp
@@ -1,3 +1,20 @@
+/*
+    Copyright (C) 2011 Adam Wardyński, Tomasz Śniatowski, Paweł Kędzia,
+    Adam Radziszewski, Bartosz Broda
+    Part of the WCCL project
+
+    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 LICENSE and COPYING files for more details.
+*/
+
 /**
   *Tests for mwe.h
   *
diff --git a/libmwereader/tests/mwefunctional.cpp b/libmwereader/tests/mwefunctional.cpp
index 5e0b082fe5348bb93b8ff52cf769caeb5da89aa4..1889730bef77f5a522ed1a9d3dfc7092fddcbd6c 100644
--- a/libmwereader/tests/mwefunctional.cpp
+++ b/libmwereader/tests/mwefunctional.cpp
@@ -1,3 +1,20 @@
+/*
+    Copyright (C) 2011 Adam Wardyński, Tomasz Śniatowski, Paweł Kędzia,
+    Adam Radziszewski, Bartosz Broda
+    Part of the WCCL project
+
+    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 LICENSE and COPYING files for more details.
+*/
+
 #include <boost/test/unit_test.hpp>
 #include <boost/filesystem.hpp>
 
@@ -33,6 +50,7 @@ struct Fixture{
 
 
 
+
 BOOST_FIXTURE_TEST_CASE( preferred_lexeme, Fixture)
 {
 	BOOST_MESSAGE("test: finding preferred lexeme");
@@ -47,6 +65,7 @@ BOOST_FIXTURE_TEST_CASE( preferred_lexeme, Fixture)
 
 
 }
+
 BOOST_FIXTURE_TEST_CASE( lexeme_no_white_spaces, Fixture)
 {
 	BOOST_MESSAGE("=====================\ntest: no white space after or before");
@@ -162,6 +181,78 @@ BOOST_FIXTURE_TEST_CASE( flex_gap_noun , Fixture)
 
 }
 
+BOOST_FIXTURE_TEST_CASE( get_next_chunk, Fixture)
+{
+	const Corpus2::Tagset& tset = Corpus2::get_named_tagset("kipi");
+	Corpus2::MWEReader mwr1(tset, test_corpus.string());
+	mwr1.set_option("inner:xces");
+	mwr1.set_option("mwefile:"+ (data_dir / "fix_mwe.xml").string());
+
+	mwr1.get_next_chunk();
+	mwr1.get_next_chunk();
+	mwr1.get_next_chunk();
+	mwr1.get_next_chunk();
+	mwr1.get_next_chunk();
+	mwr1.get_next_chunk();
+	mwr1.get_next_chunk();
+	BOOST_CHECK(mwr1.get_next_chunk()!=NULL);
+	BOOST_CHECK(mwr1.get_next_chunk()==NULL);
+}
+
+BOOST_FIXTURE_TEST_CASE( get_next_sentence, Fixture)
+{
+	const Corpus2::Tagset& tset = Corpus2::get_named_tagset("kipi");
+	Corpus2::MWEReader mwr1(tset, test_corpus.string());
+	mwr1.set_option("inner:xces");
+	mwr1.set_option("mwefile:"+ (data_dir / "fix_mwe.xml").string());
+
+	mwr1.get_next_sentence();
+	mwr1.get_next_sentence();
+	mwr1.get_next_sentence();
+	mwr1.get_next_sentence();
+	mwr1.get_next_sentence();
+	mwr1.get_next_sentence();
+	mwr1.get_next_sentence();
+	BOOST_CHECK(mwr1.get_next_sentence()!=NULL);
+	BOOST_CHECK(mwr1.get_next_sentence()==NULL);
+}
+
+BOOST_FIXTURE_TEST_CASE( flex_no_gap_new , Fixture)
+{
+	BOOST_MESSAGE("=====================\ntest: finding flex mwe");
+	const Corpus2::Tagset& tset = Corpus2::get_named_tagset("kipi");
+	Corpus2::MWEReader mwr(tset, test_corpus.string());
+	mwr.set_option("inner:xces");
+
+	mwr.set_option("mwefile:"+ (data_dir / "flex_mwe.xml").string());
+	Corpus2::Token* mwu;
+	for(int i=0; i<120 ; i++)
+	{
+		switch(i)
+		{
+			case 26:
+				mwu = mwr.get_next_token();
+				BOOST_CHECK(mwu->orth_utf8() == "dzień dobry");
+				BOOST_CHECK(mwu->get_preferred_lexeme(tset).lemma_utf8() == "dzień dobry");
+				break;
+			case 48:
+				mwu = mwr.get_next_token();
+				BOOST_CHECK(mwu->orth_utf8() == "dobry dzień");
+				BOOST_CHECK(mwu->get_preferred_lexeme(tset).lemma_utf8() == "dzień dobry");
+				break;
+			default:
+				mwr.get_next_token();
+		}
+
+	}
+}
+
+
+
+
+
+//Check NULL
+
 
 
 BOOST_AUTO_TEST_SUITE_END()
diff --git a/libmwereader/tests/mweparser.cpp b/libmwereader/tests/mweparser.cpp
index e4b8082820c2d22bd2cfd5bc0bcb7a7f99ff7e3a..7e1c0bb6c75df330949823d7c70df523a4bc561c 100644
--- a/libmwereader/tests/mweparser.cpp
+++ b/libmwereader/tests/mweparser.cpp
@@ -1,3 +1,20 @@
+/*
+    Copyright (C) 2011 Adam Wardyński, Tomasz Śniatowski, Paweł Kędzia,
+    Adam Radziszewski, Bartosz Broda
+    Part of the WCCL project
+
+    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 LICENSE and COPYING files for more details.
+*/
+
 #include <boost/test/unit_test.hpp>
 #include <boost/filesystem.hpp>
 
diff --git a/libmwereader/tests/mwereader.cpp b/libmwereader/tests/mwereader.cpp
index 97498a6836efb1c2a05bce4308dd19702711ab10..01eba0ccdaf61860d51590829b67f7f324fb1e13 100644
--- a/libmwereader/tests/mwereader.cpp
+++ b/libmwereader/tests/mwereader.cpp
@@ -1,3 +1,20 @@
+/*
+    Copyright (C) 2011 Adam Wardyński, Tomasz Śniatowski, Paweł Kędzia,
+    Adam Radziszewski, Bartosz Broda
+    Part of the WCCL project
+
+    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 LICENSE and COPYING files for more details.
+*/
+
 #include <boost/test/unit_test.hpp>
 #include <boost/filesystem.hpp>
 
diff --git a/libwccl/CMakeLists.txt b/libwccl/CMakeLists.txt
index 123bf257549ba0e2b2e72c4f9805feb62af305f5..1a0736a68abab08640ba48ee8977cff720d66599 100644
--- a/libwccl/CMakeLists.txt
+++ b/libwccl/CMakeLists.txt
@@ -2,9 +2,11 @@
 
 PROJECT(wccl)
 
+configure_file(version.in include/libwccl/version.h)
 include_directories( ${CMAKE_CURRENT_BINARY_DIR}/include/ )
+add_definitions(-DHAVE_VERSION_H)
 
-find_package(Corpus2 1.0.9 REQUIRED)
+find_package(Corpus2 1.0.12 REQUIRED)
 set(LIBS ${LIBS} ${Corpus2_LIBRARIES})
 
 find_package(PwrUtils 1.0.1 REQUIRED)
@@ -37,6 +39,7 @@ SET(libwccl_STAT_SRC
 	ops/functions/bool/iterations/leftlook.cpp
 	ops/functions/bool/iterations/only.cpp
 	ops/functions/bool/iterations/rightlook.cpp
+	ops/functions/bool/iterations/skip.cpp
 	ops/functions/bool/predicate.cpp
 	ops/functions/bool/predicates/ambiguous.cpp
 	ops/functions/bool/predicates/and.cpp
@@ -67,7 +70,9 @@ SET(libwccl_STAT_SRC
 	ops/functions/tset/catfilter.cpp
 	ops/functions/tset/getsymbols.cpp
 	ops/functions/tset/getsymbolsinrange.cpp
+	ops/match/actions/markbase.cpp
 	ops/match/actions/markmatch.cpp
+	ops/match/actions/overwritematch.cpp
 	ops/match/actions/unmarkmatch.cpp
 	ops/match/applyoperator.cpp
 	ops/match/conditions/conjconditions.cpp
@@ -157,8 +162,8 @@ endif(WIN32)
 target_link_libraries ( wccl ${LIBS})
 
 set_target_properties(wccl PROPERTIES
-	VERSION "${ver_major}.${ver_minor}"
-	SOVERSION ${ver_major})
+	VERSION "${wccl_ver_major}.${wccl_ver_minor}"
+	SOVERSION ${wccl_ver_major})
 
 
 if(UNIX)
diff --git a/libwccl/exception.cpp b/libwccl/exception.cpp
index e1c6a297cdc515613da5e8e15f239745f0e45d64..7f750967cce52b93382ac2a2439716834df2ffc7 100644
--- a/libwccl/exception.cpp
+++ b/libwccl/exception.cpp
@@ -1,3 +1,20 @@
+/*
+    Copyright (C) 2011 Adam Wardyński, Tomasz Śniatowski, Paweł Kędzia,
+    Adam Radziszewski, Bartosz Broda
+    Part of the WCCL project
+
+    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 LICENSE and COPYING files for more details.
+*/
+
 #include <libwccl/exception.h>
 #include <sstream>
 
diff --git a/libwccl/exception.h b/libwccl/exception.h
index 74b9576cb0427c4ecc8babc6eb8fe6ef2d65471b..f97ccb4309d7dfed88ab96ac7a705f5afb80e680 100644
--- a/libwccl/exception.h
+++ b/libwccl/exception.h
@@ -1,3 +1,20 @@
+/*
+    Copyright (C) 2011 Adam Wardyński, Tomasz Śniatowski, Paweł Kędzia,
+    Adam Radziszewski, Bartosz Broda
+    Part of the WCCL project
+
+    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 LICENSE and COPYING files for more details.
+*/
+
 #ifndef LIBWCCL_EXCEPTION_H
 #define LIBWCCL_EXCEPTION_H
 
diff --git a/libwccl/lexicon/lexicon.cpp b/libwccl/lexicon/lexicon.cpp
index 74d13417258765e581a9166dae0a63122ec44952..400882b98fd3e2659f61c52cc5e3f1d307bae991 100644
--- a/libwccl/lexicon/lexicon.cpp
+++ b/libwccl/lexicon/lexicon.cpp
@@ -1,3 +1,20 @@
+/*
+    Copyright (C) 2011 Adam Wardyński, Tomasz Śniatowski, Paweł Kędzia,
+    Adam Radziszewski, Bartosz Broda
+    Part of the WCCL project
+
+    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 LICENSE and COPYING files for more details.
+*/
+
 #include <libwccl/lexicon/lexicon.h>
 #include <libpwrutils/util.h>
 #include <libwccl/exception.h>
diff --git a/libwccl/lexicon/lexicon.h b/libwccl/lexicon/lexicon.h
index 8cc9d2ae435fc521417b096a2ee7d7eb89e625a3..19f2c36eea1c866d242ca5a838e5d07255f995f3 100644
--- a/libwccl/lexicon/lexicon.h
+++ b/libwccl/lexicon/lexicon.h
@@ -1,3 +1,20 @@
+/*
+    Copyright (C) 2011 Adam Wardyński, Tomasz Śniatowski, Paweł Kędzia,
+    Adam Radziszewski, Bartosz Broda
+    Part of the WCCL project
+
+    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 LICENSE and COPYING files for more details.
+*/
+
 #ifndef LIBWCCL_LEXICON_LEXICON_H
 #define LIBWCCL_LEXICON_LEXICON_H
 
diff --git a/libwccl/lexicon/lexiconparser.cpp b/libwccl/lexicon/lexiconparser.cpp
index 578d322bf3bb69ea16c309bc652d3412306903d1..90e5b460b5b059f16576bf4e480342c97bdde3e3 100644
--- a/libwccl/lexicon/lexiconparser.cpp
+++ b/libwccl/lexicon/lexiconparser.cpp
@@ -1,3 +1,20 @@
+/*
+    Copyright (C) 2011 Adam Wardyński, Tomasz Śniatowski, Paweł Kędzia,
+    Adam Radziszewski, Bartosz Broda
+    Part of the WCCL project
+
+    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 LICENSE and COPYING files for more details.
+*/
+
 #include <libwccl/lexicon/lexiconparser.h>
 #include "ANTLRLexiconParser.hpp"
 #include "ANTLRLexiconLexer.hpp"
diff --git a/libwccl/lexicon/lexiconparser.h b/libwccl/lexicon/lexiconparser.h
index 51cf73afff49f0f57f230b1f35cf8379149c0887..a814273d116e6b72268088077c7928c4ec77b2b2 100644
--- a/libwccl/lexicon/lexiconparser.h
+++ b/libwccl/lexicon/lexiconparser.h
@@ -1,3 +1,20 @@
+/*
+    Copyright (C) 2011 Adam Wardyński, Tomasz Śniatowski, Paweł Kędzia,
+    Adam Radziszewski, Bartosz Broda
+    Part of the WCCL project
+
+    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 LICENSE and COPYING files for more details.
+*/
+
 #ifndef LIBWCCL_LEXICON_LEXICONPARSER_H
 #define LIBWCCL_LEXICON_LEXICONPARSER_H
 
diff --git a/libwccl/lexicon/lexicons.cpp b/libwccl/lexicon/lexicons.cpp
index 836e2706777effff904bdfd5aa7ba2f5406f7635..68a368f0223bbdbacdebef3031c5477b151f3f4b 100644
--- a/libwccl/lexicon/lexicons.cpp
+++ b/libwccl/lexicon/lexicons.cpp
@@ -1,3 +1,20 @@
+/*
+    Copyright (C) 2011 Adam Wardyński, Tomasz Śniatowski, Paweł Kędzia,
+    Adam Radziszewski, Bartosz Broda
+    Part of the WCCL project
+
+    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 LICENSE and COPYING files for more details.
+*/
+
 #include <libwccl/lexicon/lexicons.h>
 #include <libwccl/exception.h>
 
diff --git a/libwccl/lexicon/lexicons.h b/libwccl/lexicon/lexicons.h
index 96f4fa1b2d0f4499558df39a4750d87950698ea9..5afb880978bab53fc28b6106375e9ec42382727f 100644
--- a/libwccl/lexicon/lexicons.h
+++ b/libwccl/lexicon/lexicons.h
@@ -1,3 +1,20 @@
+/*
+    Copyright (C) 2011 Adam Wardyński, Tomasz Śniatowski, Paweł Kędzia,
+    Adam Radziszewski, Bartosz Broda
+    Part of the WCCL project
+
+    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 LICENSE and COPYING files for more details.
+*/
+
 #ifndef LIBWCCL_LEXICON_LEXICONS_H
 #define LIBWCCL_LEXICON_LEXICONS_H
 
diff --git a/libwccl/ops/actionexeccontext.h b/libwccl/ops/actionexeccontext.h
index b49b5134115733d431c4dbad47e1dcc52b901e9f..39e791edbcf5ec00420ad957e58b0e9815188da3 100644
--- a/libwccl/ops/actionexeccontext.h
+++ b/libwccl/ops/actionexeccontext.h
@@ -1,3 +1,20 @@
+/*
+    Copyright (C) 2011 Adam Wardyński, Tomasz Śniatowski, Paweł Kędzia,
+    Adam Radziszewski, Bartosz Broda
+    Part of the WCCL project
+
+    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 LICENSE and COPYING files for more details.
+*/
+
 #ifndef LIBWCCL_OPS_ACTIONEXECCONTEXT_H
 #define LIBWCCL_OPS_ACTIONEXECCONTEXT_H
 
diff --git a/libwccl/ops/expression.h b/libwccl/ops/expression.h
index 4c3b045d2daf1a207f3e3c621f152cd02d3085f4..d0a656402776a7db3121b53fb35bd444f2bec520 100644
--- a/libwccl/ops/expression.h
+++ b/libwccl/ops/expression.h
@@ -1,3 +1,20 @@
+/*
+    Copyright (C) 2011 Adam Wardyński, Tomasz Śniatowski, Paweł Kędzia,
+    Adam Radziszewski, Bartosz Broda
+    Part of the WCCL project
+
+    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 LICENSE and COPYING files for more details.
+*/
+
 #ifndef LIBWCCL_OPS_EXPRESSION_H
 #define LIBWCCL_OPS_EXPRESSION_H
 
diff --git a/libwccl/ops/formatters.cpp b/libwccl/ops/formatters.cpp
index 556e8abd34b3424718be9fb995d3787a95d3aaa8..61ff223286dd68ca3feeccf38795c6d23edfa909 100644
--- a/libwccl/ops/formatters.cpp
+++ b/libwccl/ops/formatters.cpp
@@ -1,3 +1,20 @@
+/*
+    Copyright (C) 2011 Adam Wardyński, Tomasz Śniatowski, Paweł Kędzia,
+    Adam Radziszewski, Bartosz Broda
+    Part of the WCCL project
+
+    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 LICENSE and COPYING files for more details.
+*/
+
 #include <libwccl/ops/formatters.h>
 #include <sstream>
 
diff --git a/libwccl/ops/formatters.h b/libwccl/ops/formatters.h
index 5c2bd3bafa99c8e9581d92d8f850d4609da7aa45..a50632a2dbe56f0ac0f90c92407a7ea0a7c6dea3 100644
--- a/libwccl/ops/formatters.h
+++ b/libwccl/ops/formatters.h
@@ -1,3 +1,20 @@
+/*
+    Copyright (C) 2011 Adam Wardyński, Tomasz Śniatowski, Paweł Kędzia,
+    Adam Radziszewski, Bartosz Broda
+    Part of the WCCL project
+
+    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 LICENSE and COPYING files for more details.
+*/
+
 #ifndef LIBWCCL_OPS_FORMATTERS_H
 #define LIBWCCL_OPS_FORMATTERS_H
 
diff --git a/libwccl/ops/function.h b/libwccl/ops/function.h
index 3aa008325f83f49f4371353afb150028d4a76559..c6d74c51731b68eea8c3cf147bf6ee9171a91af8 100644
--- a/libwccl/ops/function.h
+++ b/libwccl/ops/function.h
@@ -1,3 +1,20 @@
+/*
+    Copyright (C) 2011 Adam Wardyński, Tomasz Śniatowski, Paweł Kędzia,
+    Adam Radziszewski, Bartosz Broda
+    Part of the WCCL project
+
+    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 LICENSE and COPYING files for more details.
+*/
+
 #ifndef LIBWCCL_OPS_FUNCTIONS_H
 #define LIBWCCL_OPS_FUNCTIONS_H
 
diff --git a/libwccl/ops/functions/bool/iteration.cpp b/libwccl/ops/functions/bool/iteration.cpp
index 9a6982a177dda80cdcd6c2d70f52702c6a4617ef..27068bf268eb9fe6a9e96e2bf01c738d785c383b 100644
--- a/libwccl/ops/functions/bool/iteration.cpp
+++ b/libwccl/ops/functions/bool/iteration.cpp
@@ -1,3 +1,20 @@
+/*
+    Copyright (C) 2011 Adam Wardyński, Tomasz Śniatowski, Paweł Kędzia,
+    Adam Radziszewski, Bartosz Broda
+    Part of the WCCL project
+
+    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 LICENSE and COPYING files for more details.
+*/
+
 #include <libwccl/ops/functions/bool/iteration.h>
 #include <libwccl/ops/functions/bool/predicate.h>
 
diff --git a/libwccl/ops/functions/bool/iteration.h b/libwccl/ops/functions/bool/iteration.h
index cb96a2e59a8c8841a7670362fc2bc636a8967221..6e800c3bd37f2e513f66194b2743bbb6a5c8c4c5 100644
--- a/libwccl/ops/functions/bool/iteration.h
+++ b/libwccl/ops/functions/bool/iteration.h
@@ -1,3 +1,20 @@
+/*
+    Copyright (C) 2011 Adam Wardyński, Tomasz Śniatowski, Paweł Kędzia,
+    Adam Radziszewski, Bartosz Broda
+    Part of the WCCL project
+
+    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 LICENSE and COPYING files for more details.
+*/
+
 #ifndef LIBWCCL_OPS_FUNCTIONS_BOOL_ITERATION_H
 #define LIBWCCL_OPS_FUNCTIONS_BOOL_ITERATION_H
 
diff --git a/libwccl/ops/functions/bool/iterations/atleast.cpp b/libwccl/ops/functions/bool/iterations/atleast.cpp
index ea3d7c90c7f7ca593cd8c7d990b60b0653377707..f861847c52e72280ca4f4baf9d3c32181b7b2344 100644
--- a/libwccl/ops/functions/bool/iterations/atleast.cpp
+++ b/libwccl/ops/functions/bool/iterations/atleast.cpp
@@ -1,3 +1,20 @@
+/*
+    Copyright (C) 2011 Adam Wardyński, Tomasz Śniatowski, Paweł Kędzia,
+    Adam Radziszewski, Bartosz Broda
+    Part of the WCCL project
+
+    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 LICENSE and COPYING files for more details.
+*/
+
 #include <libwccl/ops/functions/bool/iterations/atleast.h>
 #include <sstream>
 
diff --git a/libwccl/ops/functions/bool/iterations/atleast.h b/libwccl/ops/functions/bool/iterations/atleast.h
index a2b756eee5034dcc7fea5666762293fc7b856a1b..609617677869dfa45a8b7a676f9e42282eff38a9 100644
--- a/libwccl/ops/functions/bool/iterations/atleast.h
+++ b/libwccl/ops/functions/bool/iterations/atleast.h
@@ -1,3 +1,20 @@
+/*
+    Copyright (C) 2011 Adam Wardyński, Tomasz Śniatowski, Paweł Kędzia,
+    Adam Radziszewski, Bartosz Broda
+    Part of the WCCL project
+
+    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 LICENSE and COPYING files for more details.
+*/
+
 #ifndef LIBWCCL_OPS_FUNCTIONS_BOOL_ITERATIONS_ATLEAST_H
 #define LIBWCCL_OPS_FUNCTIONS_BOOL_ITERATIONS_ATLEAST_H
 
@@ -65,7 +82,7 @@ protected:
 	std::ostream& write_to(std::ostream& ostream) const;
 
 private:
-	int min_matches_;
+	const int min_matches_;
 };
 
 
diff --git a/libwccl/ops/functions/bool/iterations/leftlook.cpp b/libwccl/ops/functions/bool/iterations/leftlook.cpp
index 349b40c2ae301ead0b495dccb2a72cc29923fc0c..777508cfc118ed718ae3e5755fb4f18c12d359b8 100644
--- a/libwccl/ops/functions/bool/iterations/leftlook.cpp
+++ b/libwccl/ops/functions/bool/iterations/leftlook.cpp
@@ -1,3 +1,20 @@
+/*
+    Copyright (C) 2011 Adam Wardyński, Tomasz Śniatowski, Paweł Kędzia,
+    Adam Radziszewski, Bartosz Broda
+    Part of the WCCL project
+
+    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 LICENSE and COPYING files for more details.
+*/
+
 #include <libwccl/ops/functions/bool/iterations/leftlook.h>
 
 namespace Wccl {
diff --git a/libwccl/ops/functions/bool/iterations/leftlook.h b/libwccl/ops/functions/bool/iterations/leftlook.h
index e0776c68c47a8f83e887795ab293f20f95c035ae..53b67a3b19b8f3e0592fe07f1fb9bde925b16e6d 100644
--- a/libwccl/ops/functions/bool/iterations/leftlook.h
+++ b/libwccl/ops/functions/bool/iterations/leftlook.h
@@ -1,3 +1,20 @@
+/*
+    Copyright (C) 2011 Adam Wardyński, Tomasz Śniatowski, Paweł Kędzia,
+    Adam Radziszewski, Bartosz Broda
+    Part of the WCCL project
+
+    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 LICENSE and COPYING files for more details.
+*/
+
 #ifndef LIBWCCL_OPS_FUNCTIONS_BOOL_ITERATIONS_LEFTLOOK_H
 #define LIBWCCL_OPS_FUNCTIONS_BOOL_ITERATIONS_LEFTLOOK_H
 
diff --git a/libwccl/ops/functions/bool/iterations/only.cpp b/libwccl/ops/functions/bool/iterations/only.cpp
index 32d9f16015085b7baaa66ceccc5ec7838f5401b9..208f888c8eef2fe6d8b3d0cee58e6858b4f33438 100644
--- a/libwccl/ops/functions/bool/iterations/only.cpp
+++ b/libwccl/ops/functions/bool/iterations/only.cpp
@@ -1,3 +1,20 @@
+/*
+    Copyright (C) 2011 Adam Wardyński, Tomasz Śniatowski, Paweł Kędzia,
+    Adam Radziszewski, Bartosz Broda
+    Part of the WCCL project
+
+    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 LICENSE and COPYING files for more details.
+*/
+
 #include <libwccl/ops/functions/bool/iterations/only.h>
 
 namespace Wccl {
diff --git a/libwccl/ops/functions/bool/iterations/only.h b/libwccl/ops/functions/bool/iterations/only.h
index f11d6f536836597834cf9c062fa124826e7e4d73..022cb63a011c2d9023368f02a2989b25e0e30b3d 100644
--- a/libwccl/ops/functions/bool/iterations/only.h
+++ b/libwccl/ops/functions/bool/iterations/only.h
@@ -1,3 +1,20 @@
+/*
+    Copyright (C) 2011 Adam Wardyński, Tomasz Śniatowski, Paweł Kędzia,
+    Adam Radziszewski, Bartosz Broda
+    Part of the WCCL project
+
+    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 LICENSE and COPYING files for more details.
+*/
+
 #ifndef LIBWCCL_OPS_FUNCTIONS_BOOL_ITERATIONS_ONLY_H
 #define LIBWCCL_OPS_FUNCTIONS_BOOL_ITERATIONS_ONLY_H
 
diff --git a/libwccl/ops/functions/bool/iterations/rightlook.cpp b/libwccl/ops/functions/bool/iterations/rightlook.cpp
index 70b4cdae1dc7fcbe03e4154d19df1cfbd0c29009..646f1d9e71f891819aba59685933c383aa4bd453 100644
--- a/libwccl/ops/functions/bool/iterations/rightlook.cpp
+++ b/libwccl/ops/functions/bool/iterations/rightlook.cpp
@@ -1,3 +1,20 @@
+/*
+    Copyright (C) 2011 Adam Wardyński, Tomasz Śniatowski, Paweł Kędzia,
+    Adam Radziszewski, Bartosz Broda
+    Part of the WCCL project
+
+    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 LICENSE and COPYING files for more details.
+*/
+
 #include <libwccl/ops/functions/bool/iterations/rightlook.h>
 
 namespace Wccl {
diff --git a/libwccl/ops/functions/bool/iterations/rightlook.h b/libwccl/ops/functions/bool/iterations/rightlook.h
index 579aea3bd594034668c7038c17530cedc314fae8..5b1c26bd8a403b99f4f9f84a176612d094bce926 100644
--- a/libwccl/ops/functions/bool/iterations/rightlook.h
+++ b/libwccl/ops/functions/bool/iterations/rightlook.h
@@ -1,3 +1,20 @@
+/*
+    Copyright (C) 2011 Adam Wardyński, Tomasz Śniatowski, Paweł Kędzia,
+    Adam Radziszewski, Bartosz Broda
+    Part of the WCCL project
+
+    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 LICENSE and COPYING files for more details.
+*/
+
 #ifndef LIBWCCL_OPS_FUNCTIONS_BOOL_ITERATIONS_RIGHTLOOK_H
 #define LIBWCCL_OPS_FUNCTIONS_BOOL_ITERATIONS_RIGHTLOOK_H
 
diff --git a/libwccl/ops/functions/bool/iterations/skip.cpp b/libwccl/ops/functions/bool/iterations/skip.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..098f8f360947213b1b1bd46e5ef0bb36300c6264
--- /dev/null
+++ b/libwccl/ops/functions/bool/iterations/skip.cpp
@@ -0,0 +1,78 @@
+/*
+    Copyright (C) 2011 Adam Wardyński, Tomasz Śniatowski, Paweł Kędzia,
+    Adam Radziszewski, Bartosz Broda
+    Part of the WCCL project
+
+    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 LICENSE and COPYING files for more details.
+*/
+
+#include <libwccl/ops/functions/bool/iterations/skip.h>
+#include <libwccl/ops/functions/bool/predicate.h>
+
+namespace Wccl {
+
+std::string Skip::to_string(const Corpus2::Tagset& tagset) const
+{
+	std::ostringstream ss;
+	ss << name(tagset) << "("
+		<< central_pos_expr_->to_string(tagset) << ", "
+		<< Position::var_repr(iter_var_acc_.get_name()) << ", "
+		<< evaluating_expr_->to_string(tagset) << ", "
+		<< offset_ << ")";
+	return ss.str();
+}
+
+std::ostream& Skip::write_to(std::ostream& os) const
+{
+	return os << raw_name() << "("
+			<< *central_pos_expr_ << ", "
+			<< Position::var_repr(iter_var_acc_.get_name()) << ", "
+			<< *evaluating_expr_ << ","
+			<< offset_ << ")";
+}
+
+Skip::BaseRetValPtr Skip::apply_internal(const FunExecContext& context) const
+{
+	const boost::shared_ptr<Position>& iter_var =
+		context.variables()->get_fast(iter_var_acc_);
+	const boost::shared_ptr<const Position>& central_pos =
+										central_pos_expr_->apply(context);
+
+	if (context.sentence_context().is_inside(*central_pos)) {
+		// set iter_var to central_pos and iterate from here
+		iter_var->set_value(central_pos->get_value());
+		int offset_now = offset_;
+
+		while (offset_now != 0) {
+			// go one step towards the right direction
+			int direction = (offset_now > 0) ? +1 : -1;
+			iter_var->set_value(iter_var->get_value() + direction);
+			// if it's already out of sentence, fail
+			if (context.sentence_context().is_outside(*iter_var)) {
+				iter_var->set_value(Position::Nowhere);
+				return Predicate::False(context);
+			}
+			// if the skip-pred not satisfied here, decrement the steps to go
+			if(!evaluating_expr_->apply(context)->get_value()) {
+				offset_now -= direction;
+			}
+		}
+		// offset reached, the iteration is complete
+		return Predicate::True(context);
+
+	}
+	// Failure. Set iteration variable to Nowhere and return False.
+	iter_var->set_value(Position::Nowhere);
+	return Predicate::False(context);
+}
+
+} /* end ns Wccl */
diff --git a/libwccl/ops/functions/bool/iterations/skip.h b/libwccl/ops/functions/bool/iterations/skip.h
new file mode 100644
index 0000000000000000000000000000000000000000..e71bafb047c93e047d5cabc531eac98562a68168
--- /dev/null
+++ b/libwccl/ops/functions/bool/iterations/skip.h
@@ -0,0 +1,73 @@
+/*
+    Copyright (C) 2011 Adam Wardyński, Tomasz Śniatowski, Paweł Kędzia,
+    Adam Radziszewski, Bartosz Broda
+    Part of the WCCL project
+
+    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 LICENSE and COPYING files for more details.
+*/
+
+#ifndef LIBWCCL_OPS_FUNCTIONS_BOOL_ITERATIONS_SKIP_H
+#define LIBWCCL_OPS_FUNCTIONS_BOOL_ITERATIONS_SKIP_H
+
+#include <libwccl/ops/function.h>
+#include <libwccl/values/bool.h>
+#include <libwccl/values/position.h>
+
+namespace Wccl {
+
+/**
+ * Iterative operator "skip", setting the position variable to given
+ * value plus offset, having skipped positions where given predicate
+ * is satisfied.
+ */
+class Skip : public Function<Bool>
+{
+public:
+	typedef boost::shared_ptr<Function<Position> > PosFunctionPtr;
+	typedef boost::shared_ptr<Function<Bool> > BoolFunctionPtr;
+	Skip(
+		const PosFunctionPtr& central_pos_expr,
+		const VariableAccessor<Position>& iter_var_acc,
+		const BoolFunctionPtr& evaluating_expr,
+		int offset)
+		: central_pos_expr_(central_pos_expr),
+		  iter_var_acc_(iter_var_acc),
+		  evaluating_expr_(evaluating_expr),
+		  offset_(offset)
+	{
+		BOOST_ASSERT(central_pos_expr_);
+		BOOST_ASSERT(evaluating_expr_);
+	}
+
+	/**
+	 * @returns Name of the function: "skip".
+	 */
+	std::string raw_name() const {
+		return "skip";
+	}
+
+	std::string to_string(const Corpus2::Tagset& tagset) const;
+
+protected:
+	std::ostream& write_to(std::ostream& ostream) const;
+	BaseRetValPtr apply_internal(const FunExecContext& context) const;
+
+private:
+	const PosFunctionPtr central_pos_expr_;
+	const VariableAccessor<Position> iter_var_acc_;
+	const BoolFunctionPtr evaluating_expr_;
+	const int offset_;
+
+};
+} /* end ns Wccl */
+
+#endif // LIBWCCL_OPS_FUNCTIONS_BOOL_ITERATIONS_SKIP_H
diff --git a/libwccl/ops/functions/bool/predicate.cpp b/libwccl/ops/functions/bool/predicate.cpp
index 9c5b19ad45399c1e8f0eada483e6af3ba823bfb3..582fd4989cfbc9d2e21c806373539ac8cf7c5961 100644
--- a/libwccl/ops/functions/bool/predicate.cpp
+++ b/libwccl/ops/functions/bool/predicate.cpp
@@ -1,3 +1,20 @@
+/*
+    Copyright (C) 2011 Adam Wardyński, Tomasz Śniatowski, Paweł Kędzia,
+    Adam Radziszewski, Bartosz Broda
+    Part of the WCCL project
+
+    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 LICENSE and COPYING files for more details.
+*/
+
 #include <libwccl/ops/functions/bool/predicate.h>
 
 namespace Wccl {
diff --git a/libwccl/ops/functions/bool/predicate.h b/libwccl/ops/functions/bool/predicate.h
index 644a76fcf1c34668abbe7e1ed0fd31ecf2c99678..bf3cfd44b82c9d8f929be9f6cc65a63ad4511afb 100644
--- a/libwccl/ops/functions/bool/predicate.h
+++ b/libwccl/ops/functions/bool/predicate.h
@@ -1,3 +1,20 @@
+/*
+    Copyright (C) 2011 Adam Wardyński, Tomasz Śniatowski, Paweł Kędzia,
+    Adam Radziszewski, Bartosz Broda
+    Part of the WCCL project
+
+    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 LICENSE and COPYING files for more details.
+*/
+
 #ifndef LIBWCCL_OPS_FUNCTIONS_BOOL_PREDICATE_H
 #define LIBWCCL_OPS_FUNCTIONS_BOOL_PREDICATE_H
 
diff --git a/libwccl/ops/functions/bool/predicates/ambiguous.cpp b/libwccl/ops/functions/bool/predicates/ambiguous.cpp
index 9e9fdc4a93016520ddb3f59b3289edecbf5f83c1..8e636559af9d9de4fa4c09d62b02c310f25e521e 100644
--- a/libwccl/ops/functions/bool/predicates/ambiguous.cpp
+++ b/libwccl/ops/functions/bool/predicates/ambiguous.cpp
@@ -1,3 +1,20 @@
+/*
+    Copyright (C) 2011 Adam Wardyński, Tomasz Śniatowski, Paweł Kędzia,
+    Adam Radziszewski, Bartosz Broda
+    Part of the WCCL project
+
+    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 LICENSE and COPYING files for more details.
+*/
+
 #include <libwccl/ops/functions/bool/predicates/ambiguous.h>
 
 namespace Wccl {
diff --git a/libwccl/ops/functions/bool/predicates/ambiguous.h b/libwccl/ops/functions/bool/predicates/ambiguous.h
index f21ab2de9aee5ebbc78141f007e8fa21e8ca0915..8fa65b0f1ca99a71c91043bdaa44c1d893b6b212 100644
--- a/libwccl/ops/functions/bool/predicates/ambiguous.h
+++ b/libwccl/ops/functions/bool/predicates/ambiguous.h
@@ -1,3 +1,20 @@
+/*
+    Copyright (C) 2011 Adam Wardyński, Tomasz Śniatowski, Paweł Kędzia,
+    Adam Radziszewski, Bartosz Broda
+    Part of the WCCL project
+
+    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 LICENSE and COPYING files for more details.
+*/
+
 #ifndef LIBWCCL_OPS_FUNCTIONS_BOOL_PREDICATES_AMBIGUOUS_H
 #define LIBWCCL_OPS_FUNCTIONS_BOOL_PREDICATES_AMBIGUOUS_H
 
diff --git a/libwccl/ops/functions/bool/predicates/and.cpp b/libwccl/ops/functions/bool/predicates/and.cpp
index 2eab7cdc0eecf4ba8be1d371f67d86e8bbee6201..f77b094753017b222e34424c446bb1dbf7b9abc6 100644
--- a/libwccl/ops/functions/bool/predicates/and.cpp
+++ b/libwccl/ops/functions/bool/predicates/and.cpp
@@ -1,3 +1,20 @@
+/*
+    Copyright (C) 2011 Adam Wardyński, Tomasz Śniatowski, Paweł Kędzia,
+    Adam Radziszewski, Bartosz Broda
+    Part of the WCCL project
+
+    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 LICENSE and COPYING files for more details.
+*/
+
 #include <libwccl/ops/functions/bool/predicates/and.h>
 #include <libpwrutils/foreach.h>
 
diff --git a/libwccl/ops/functions/bool/predicates/and.h b/libwccl/ops/functions/bool/predicates/and.h
index d7e961fb8f18558a876aa949f5013f3a3ad37f04..2162f7576452842d27152596d5285b5998ac446a 100644
--- a/libwccl/ops/functions/bool/predicates/and.h
+++ b/libwccl/ops/functions/bool/predicates/and.h
@@ -1,3 +1,20 @@
+/*
+    Copyright (C) 2011 Adam Wardyński, Tomasz Śniatowski, Paweł Kędzia,
+    Adam Radziszewski, Bartosz Broda
+    Part of the WCCL project
+
+    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 LICENSE and COPYING files for more details.
+*/
+
 #ifndef LIBWCCL_OPS_FUNCTIONS_BOOL_PREDICATES_AND_H
 #define LIBWCCL_OPS_FUNCTIONS_BOOL_PREDICATES_AND_H
 
diff --git a/libwccl/ops/functions/bool/predicates/ann.cpp b/libwccl/ops/functions/bool/predicates/ann.cpp
index dc07e957a133b2bb9d5a044d244adf949dec8a41..5900bfabd68efbd16c87a5f6b591d0f1e4a262ec 100644
--- a/libwccl/ops/functions/bool/predicates/ann.cpp
+++ b/libwccl/ops/functions/bool/predicates/ann.cpp
@@ -1,3 +1,20 @@
+/*
+    Copyright (C) 2011 Adam Wardyński, Tomasz Śniatowski, Paweł Kędzia,
+    Adam Radziszewski, Bartosz Broda
+    Part of the WCCL project
+
+    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 LICENSE and COPYING files for more details.
+*/
+
 #include <libwccl/ops/functions/bool/predicates/ann.h>
 #include <libwccl/values/match.h>
 #include <libcorpus2/ann/annotatedsentence.h>
diff --git a/libwccl/ops/functions/bool/predicates/ann.h b/libwccl/ops/functions/bool/predicates/ann.h
index e9b8d149f83e3393601a5d8dd3dfece576e81f06..24f144716498faa275d017bcb9990eabd0affb69 100644
--- a/libwccl/ops/functions/bool/predicates/ann.h
+++ b/libwccl/ops/functions/bool/predicates/ann.h
@@ -1,3 +1,20 @@
+/*
+    Copyright (C) 2011 Adam Wardyński, Tomasz Śniatowski, Paweł Kędzia,
+    Adam Radziszewski, Bartosz Broda
+    Part of the WCCL project
+
+    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 LICENSE and COPYING files for more details.
+*/
+
 #ifndef LIBWCCL_OPS_FUNCTIONS_BOOL_PREDICATES_ANN_H
 #define LIBWCCL_OPS_FUNCTIONS_BOOL_PREDICATES_ANN_H
 
diff --git a/libwccl/ops/functions/bool/predicates/annsub.cpp b/libwccl/ops/functions/bool/predicates/annsub.cpp
index cb03321eac6d43b3df7273deb7ad862af8fe0c42..58f33c481703994251b2ae5f9bcbac0da8fa524b 100644
--- a/libwccl/ops/functions/bool/predicates/annsub.cpp
+++ b/libwccl/ops/functions/bool/predicates/annsub.cpp
@@ -1,3 +1,20 @@
+/*
+    Copyright (C) 2011 Adam Wardyński, Tomasz Śniatowski, Paweł Kędzia,
+    Adam Radziszewski, Bartosz Broda
+    Part of the WCCL project
+
+    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 LICENSE and COPYING files for more details.
+*/
+
 #include <libwccl/ops/functions/bool/predicates/annsub.h>
 #include <libwccl/values/match.h>
 #include <libcorpus2/ann/annotatedsentence.h>
diff --git a/libwccl/ops/functions/bool/predicates/annsub.h b/libwccl/ops/functions/bool/predicates/annsub.h
index 0d2c235c4afb6d997e26aba470250ca6eb0dac66..73393891b5d55c9e78471f4c67a1810c39b9083f 100644
--- a/libwccl/ops/functions/bool/predicates/annsub.h
+++ b/libwccl/ops/functions/bool/predicates/annsub.h
@@ -1,3 +1,20 @@
+/*
+    Copyright (C) 2011 Adam Wardyński, Tomasz Śniatowski, Paweł Kędzia,
+    Adam Radziszewski, Bartosz Broda
+    Part of the WCCL project
+
+    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 LICENSE and COPYING files for more details.
+*/
+
 #ifndef LIBWCCL_OPS_FUNCTIONS_BOOL_PREDICATES_ANNSUB_H
 #define LIBWCCL_OPS_FUNCTIONS_BOOL_PREDICATES_ANNSUB_H
 
diff --git a/libwccl/ops/functions/bool/predicates/debug.cpp b/libwccl/ops/functions/bool/predicates/debug.cpp
index f96c09dd63c8a921a2ebda499768bad40f9b4716..35a89ee12aeef70098b9cd83a3a1fcb3f8eff38e 100644
--- a/libwccl/ops/functions/bool/predicates/debug.cpp
+++ b/libwccl/ops/functions/bool/predicates/debug.cpp
@@ -1,3 +1,20 @@
+/*
+    Copyright (C) 2011 Adam Wardyński, Tomasz Śniatowski, Paweł Kędzia,
+    Adam Radziszewski, Bartosz Broda
+    Part of the WCCL project
+
+    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 LICENSE and COPYING files for more details.
+*/
+
 #include <libwccl/ops/functions/bool/predicates/debug.h>
 #include <libwccl/ops/formatters.h>
 
diff --git a/libwccl/ops/functions/bool/predicates/debug.h b/libwccl/ops/functions/bool/predicates/debug.h
index f42613729d5c534296e317c723abc15362e698b5..8a0e077d2711a887425a7552ba5d176c0c40ef6b 100644
--- a/libwccl/ops/functions/bool/predicates/debug.h
+++ b/libwccl/ops/functions/bool/predicates/debug.h
@@ -1,3 +1,20 @@
+/*
+    Copyright (C) 2011 Adam Wardyński, Tomasz Śniatowski, Paweł Kędzia,
+    Adam Radziszewski, Bartosz Broda
+    Part of the WCCL project
+
+    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 LICENSE and COPYING files for more details.
+*/
+
 #ifndef LIBWCCL_OPS_FUNCTIONS_BOOL_PREDICATES_DEBUG_H
 #define LIBWCCL_OPS_FUNCTIONS_BOOL_PREDICATES_DEBUG_H
 
diff --git a/libwccl/ops/functions/bool/predicates/equals.h b/libwccl/ops/functions/bool/predicates/equals.h
index acac3f313f87a205780e10d1b939b04b55cd389a..483e727d76f7db66d7b358747ced49c13ae732f1 100644
--- a/libwccl/ops/functions/bool/predicates/equals.h
+++ b/libwccl/ops/functions/bool/predicates/equals.h
@@ -1,3 +1,20 @@
+/*
+    Copyright (C) 2011 Adam Wardyński, Tomasz Śniatowski, Paweł Kędzia,
+    Adam Radziszewski, Bartosz Broda
+    Part of the WCCL project
+
+    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 LICENSE and COPYING files for more details.
+*/
+
 #ifndef LIBWCCL_OPS_FUNCTIONS_BOOL_PREDICATES_EQUALS_H
 #define LIBWCCL_OPS_FUNCTIONS_BOOL_PREDICATES_EQUALS_H
 
diff --git a/libwccl/ops/functions/bool/predicates/intersects.h b/libwccl/ops/functions/bool/predicates/intersects.h
index 92c88c09e927f64b9425f71b9d9a4f5a6a98de5e..0a880473172654d8d7dab0ab8706a8f9de179bb6 100644
--- a/libwccl/ops/functions/bool/predicates/intersects.h
+++ b/libwccl/ops/functions/bool/predicates/intersects.h
@@ -1,3 +1,20 @@
+/*
+    Copyright (C) 2011 Adam Wardyński, Tomasz Śniatowski, Paweł Kędzia,
+    Adam Radziszewski, Bartosz Broda
+    Part of the WCCL project
+
+    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 LICENSE and COPYING files for more details.
+*/
+
 #ifndef LIBWCCL_OPS_FUNCTIONS_BOOL_PREDICATES_INTERSECTS_H
 #define LIBWCCL_OPS_FUNCTIONS_BOOL_PREDICATES_INTERSECTS_H
 
diff --git a/libwccl/ops/functions/bool/predicates/isempty.h b/libwccl/ops/functions/bool/predicates/isempty.h
index eedf061af3d98b23480b9993574c660ce0fc38af..15b470a1e1e3f13b898d199894cafccac0dba9b6 100644
--- a/libwccl/ops/functions/bool/predicates/isempty.h
+++ b/libwccl/ops/functions/bool/predicates/isempty.h
@@ -1,3 +1,20 @@
+/*
+    Copyright (C) 2011 Adam Wardyński, Tomasz Śniatowski, Paweł Kędzia,
+    Adam Radziszewski, Bartosz Broda
+    Part of the WCCL project
+
+    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 LICENSE and COPYING files for more details.
+*/
+
 #ifndef LIBWCCL_OPS_FUNCTIONS_BOOL_PREDICATES_ISEMPTY_H
 #define LIBWCCL_OPS_FUNCTIONS_BOOL_PREDICATES_ISEMPTY_H
 
diff --git a/libwccl/ops/functions/bool/predicates/isinside.cpp b/libwccl/ops/functions/bool/predicates/isinside.cpp
index a4a593a90c1816fed738e0b164d22fcce5694052..4ca68b1a07e844a2df1572d44ceab3aad3a5b023 100644
--- a/libwccl/ops/functions/bool/predicates/isinside.cpp
+++ b/libwccl/ops/functions/bool/predicates/isinside.cpp
@@ -1,3 +1,20 @@
+/*
+    Copyright (C) 2011 Adam Wardyński, Tomasz Śniatowski, Paweł Kędzia,
+    Adam Radziszewski, Bartosz Broda
+    Part of the WCCL project
+
+    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 LICENSE and COPYING files for more details.
+*/
+
 #include <libwccl/ops/functions/bool/predicates/isinside.h>
 #include <libwccl/ops/formatters.h>
 
diff --git a/libwccl/ops/functions/bool/predicates/isinside.h b/libwccl/ops/functions/bool/predicates/isinside.h
index 8971db5e9af6116abf790ee895d3834db811d279..b0b45ed8726f074b276365b212b5cee414c32028 100644
--- a/libwccl/ops/functions/bool/predicates/isinside.h
+++ b/libwccl/ops/functions/bool/predicates/isinside.h
@@ -1,3 +1,20 @@
+/*
+    Copyright (C) 2011 Adam Wardyński, Tomasz Śniatowski, Paweł Kędzia,
+    Adam Radziszewski, Bartosz Broda
+    Part of the WCCL project
+
+    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 LICENSE and COPYING files for more details.
+*/
+
 #ifndef LIBWCCL_OPS_FUNCTIONS_BOOL_PREDICATES_ISINSIDE_H
 #define LIBWCCL_OPS_FUNCTIONS_BOOL_PREDICATES_ISINSIDE_H
 
diff --git a/libwccl/ops/functions/bool/predicates/isoutside.cpp b/libwccl/ops/functions/bool/predicates/isoutside.cpp
index 5f6389e3086d244c3fb9cb89a5d067edbb2090f6..8cb35c2b44a74951a31c00767df685790a5bb8f9 100644
--- a/libwccl/ops/functions/bool/predicates/isoutside.cpp
+++ b/libwccl/ops/functions/bool/predicates/isoutside.cpp
@@ -1,3 +1,20 @@
+/*
+    Copyright (C) 2011 Adam Wardyński, Tomasz Śniatowski, Paweł Kędzia,
+    Adam Radziszewski, Bartosz Broda
+    Part of the WCCL project
+
+    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 LICENSE and COPYING files for more details.
+*/
+
 #include <libwccl/ops/functions/bool/predicates/isoutside.h>
 #include <libwccl/ops/formatters.h>
 
diff --git a/libwccl/ops/functions/bool/predicates/isoutside.h b/libwccl/ops/functions/bool/predicates/isoutside.h
index 96d78c8050a45795b3d39e4c916cb75c7c455f5a..ea586c2cb34e36aa354a17f3d087c66f3071b2fd 100644
--- a/libwccl/ops/functions/bool/predicates/isoutside.h
+++ b/libwccl/ops/functions/bool/predicates/isoutside.h
@@ -1,3 +1,20 @@
+/*
+    Copyright (C) 2011 Adam Wardyński, Tomasz Śniatowski, Paweł Kędzia,
+    Adam Radziszewski, Bartosz Broda
+    Part of the WCCL project
+
+    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 LICENSE and COPYING files for more details.
+*/
+
 #ifndef LIBWCCL_OPS_FUNCTIONS_BOOL_PREDICATES_ISOUTSIDE_H
 #define LIBWCCL_OPS_FUNCTIONS_BOOL_PREDICATES_ISOUTSIDE_H
 
diff --git a/libwccl/ops/functions/bool/predicates/issingular.cpp b/libwccl/ops/functions/bool/predicates/issingular.cpp
index ef9e653bda7a1783a6ea176968bdb68a9f270e0c..32f7db6ea0025737c13b48ad2eb389fb1c201093 100644
--- a/libwccl/ops/functions/bool/predicates/issingular.cpp
+++ b/libwccl/ops/functions/bool/predicates/issingular.cpp
@@ -1,3 +1,20 @@
+/*
+    Copyright (C) 2011 Adam Wardyński, Tomasz Śniatowski, Paweł Kędzia,
+    Adam Radziszewski, Bartosz Broda
+    Part of the WCCL project
+
+    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 LICENSE and COPYING files for more details.
+*/
+
 #include <libwccl/ops/functions/bool/predicates/issingular.h>
 #include <libwccl/ops/formatters.h>
 
diff --git a/libwccl/ops/functions/bool/predicates/issingular.h b/libwccl/ops/functions/bool/predicates/issingular.h
index 8e5f51c3d62bc1ea38ab2fc4acaa3ef3688a17e2..2ae3529d2e5815e24dfc53d764678cbc94ecb3bd 100644
--- a/libwccl/ops/functions/bool/predicates/issingular.h
+++ b/libwccl/ops/functions/bool/predicates/issingular.h
@@ -1,3 +1,20 @@
+/*
+    Copyright (C) 2011 Adam Wardyński, Tomasz Śniatowski, Paweł Kędzia,
+    Adam Radziszewski, Bartosz Broda
+    Part of the WCCL project
+
+    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 LICENSE and COPYING files for more details.
+*/
+
 #ifndef LIBWCCL_OPS_FUNCTIONS_BOOL_PREDICATES_ISSINGULAR_H
 #define LIBWCCL_OPS_FUNCTIONS_BOOL_PREDICATES_ISSINGULAR_H
 
diff --git a/libwccl/ops/functions/bool/predicates/issubsetof.h b/libwccl/ops/functions/bool/predicates/issubsetof.h
index 0822aab4b34a45f3dbe69ba332a2edf3e307de19..f04130317663d68dffa44233a86e52ff1cec5bf1 100644
--- a/libwccl/ops/functions/bool/predicates/issubsetof.h
+++ b/libwccl/ops/functions/bool/predicates/issubsetof.h
@@ -1,3 +1,20 @@
+/*
+    Copyright (C) 2011 Adam Wardyński, Tomasz Śniatowski, Paweł Kędzia,
+    Adam Radziszewski, Bartosz Broda
+    Part of the WCCL project
+
+    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 LICENSE and COPYING files for more details.
+*/
+
 #ifndef LIBWCCL_OPS_FUNCTIONS_BOOL_PREDICATES_ISSUBSETOF_H
 #define LIBWCCL_OPS_FUNCTIONS_BOOL_PREDICATES_ISSUBSETOF_H
 
diff --git a/libwccl/ops/functions/bool/predicates/logicalpredicate.cpp b/libwccl/ops/functions/bool/predicates/logicalpredicate.cpp
index db7d743d67efc06dbb18cce2c670c106a614188d..44f3ea6cb92cfad097c59b130db13a92497119b7 100644
--- a/libwccl/ops/functions/bool/predicates/logicalpredicate.cpp
+++ b/libwccl/ops/functions/bool/predicates/logicalpredicate.cpp
@@ -1,3 +1,20 @@
+/*
+    Copyright (C) 2011 Adam Wardyński, Tomasz Śniatowski, Paweł Kędzia,
+    Adam Radziszewski, Bartosz Broda
+    Part of the WCCL project
+
+    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 LICENSE and COPYING files for more details.
+*/
+
 #include <libwccl/ops/functions/bool/predicates/logicalpredicate.h>
 
 namespace Wccl {
diff --git a/libwccl/ops/functions/bool/predicates/logicalpredicate.h b/libwccl/ops/functions/bool/predicates/logicalpredicate.h
index 7587b115c9963b81633711f6a968e7a1eae86326..833b8434cd9be9b7e15c1ffd40f1e3d8645e4750 100644
--- a/libwccl/ops/functions/bool/predicates/logicalpredicate.h
+++ b/libwccl/ops/functions/bool/predicates/logicalpredicate.h
@@ -1,3 +1,20 @@
+/*
+    Copyright (C) 2011 Adam Wardyński, Tomasz Śniatowski, Paweł Kędzia,
+    Adam Radziszewski, Bartosz Broda
+    Part of the WCCL project
+
+    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 LICENSE and COPYING files for more details.
+*/
+
 #ifndef LIBWCCL_OPS_FUNCTIONS_BOOL_PREDICATES_LOGICALPREDICATE_H
 #define LIBWCCL_OPS_FUNCTIONS_BOOL_PREDICATES_LOGICALPREDICATE_H
 
diff --git a/libwccl/ops/functions/bool/predicates/nor.cpp b/libwccl/ops/functions/bool/predicates/nor.cpp
index 4a88e46a51cf677d98e95752920dd55156243ae9..85f8b5c54f851977b00b1028901b80a187d81076 100644
--- a/libwccl/ops/functions/bool/predicates/nor.cpp
+++ b/libwccl/ops/functions/bool/predicates/nor.cpp
@@ -1,3 +1,20 @@
+/*
+    Copyright (C) 2011 Adam Wardyński, Tomasz Śniatowski, Paweł Kędzia,
+    Adam Radziszewski, Bartosz Broda
+    Part of the WCCL project
+
+    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 LICENSE and COPYING files for more details.
+*/
+
 #include <libwccl/ops/functions/bool/predicates/nor.h>
 #include <libpwrutils/foreach.h>
 
diff --git a/libwccl/ops/functions/bool/predicates/nor.h b/libwccl/ops/functions/bool/predicates/nor.h
index 8cd592057fe8473a7cad847327609d5815a413d8..a04a53596458efc78cad04c059223285296cf6ac 100644
--- a/libwccl/ops/functions/bool/predicates/nor.h
+++ b/libwccl/ops/functions/bool/predicates/nor.h
@@ -1,3 +1,20 @@
+/*
+    Copyright (C) 2011 Adam Wardyński, Tomasz Śniatowski, Paweł Kędzia,
+    Adam Radziszewski, Bartosz Broda
+    Part of the WCCL project
+
+    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 LICENSE and COPYING files for more details.
+*/
+
 #ifndef LIBWCCL_OPS_FUNCTIONS_BOOL_PREDICATES_NOR_H
 #define LIBWCCL_OPS_FUNCTIONS_BOOL_PREDICATES_NOR_H
 
diff --git a/libwccl/ops/functions/bool/predicates/or.cpp b/libwccl/ops/functions/bool/predicates/or.cpp
index c1ff8859dbc51d5cde0e4b9b1258250dc52365d4..aef736d4e783134d05321e79e68ebb2e6d73817a 100644
--- a/libwccl/ops/functions/bool/predicates/or.cpp
+++ b/libwccl/ops/functions/bool/predicates/or.cpp
@@ -1,3 +1,20 @@
+/*
+    Copyright (C) 2011 Adam Wardyński, Tomasz Śniatowski, Paweł Kędzia,
+    Adam Radziszewski, Bartosz Broda
+    Part of the WCCL project
+
+    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 LICENSE and COPYING files for more details.
+*/
+
 #include <libwccl/ops/functions/bool/predicates/or.h>
 #include <libpwrutils/foreach.h>
 
diff --git a/libwccl/ops/functions/bool/predicates/or.h b/libwccl/ops/functions/bool/predicates/or.h
index 83d13bc3a3d2b4b8dfb2026328f9287e3798ccbe..173a50ba4b0f9d0fcb5cf3e9594e10463c018135 100644
--- a/libwccl/ops/functions/bool/predicates/or.h
+++ b/libwccl/ops/functions/bool/predicates/or.h
@@ -1,3 +1,20 @@
+/*
+    Copyright (C) 2011 Adam Wardyński, Tomasz Śniatowski, Paweł Kędzia,
+    Adam Radziszewski, Bartosz Broda
+    Part of the WCCL project
+
+    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 LICENSE and COPYING files for more details.
+*/
+
 #ifndef LIBWCCL_OPS_FUNCTIONS_BOOL_PREDICATES_OR_H
 #define LIBWCCL_OPS_FUNCTIONS_BOOL_PREDICATES_OR_H
 
diff --git a/libwccl/ops/functions/bool/predicates/pointagreement.cpp b/libwccl/ops/functions/bool/predicates/pointagreement.cpp
index 6104f5e754c02cdcd1c5fd6e6b3b1053a8b8ede2..3e007c3b5549af5b16046c88f6ac57a3dd0772ea 100644
--- a/libwccl/ops/functions/bool/predicates/pointagreement.cpp
+++ b/libwccl/ops/functions/bool/predicates/pointagreement.cpp
@@ -1,3 +1,20 @@
+/*
+    Copyright (C) 2011 Adam Wardyński, Tomasz Śniatowski, Paweł Kędzia,
+    Adam Radziszewski, Bartosz Broda
+    Part of the WCCL project
+
+    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 LICENSE and COPYING files for more details.
+*/
+
 #include <libwccl/ops/functions/bool/predicates/pointagreement.h>
 #include <libpwrutils/foreach.h>
 
diff --git a/libwccl/ops/functions/bool/predicates/pointagreement.h b/libwccl/ops/functions/bool/predicates/pointagreement.h
index 98b18f1b971af1bb5036ec1b0c3c15d29d12ef50..5a81bdcfd2b50d36f7d7e57afb748ec44d2a6562 100644
--- a/libwccl/ops/functions/bool/predicates/pointagreement.h
+++ b/libwccl/ops/functions/bool/predicates/pointagreement.h
@@ -1,3 +1,20 @@
+/*
+    Copyright (C) 2011 Adam Wardyński, Tomasz Śniatowski, Paweł Kędzia,
+    Adam Radziszewski, Bartosz Broda
+    Part of the WCCL project
+
+    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 LICENSE and COPYING files for more details.
+*/
+
 #ifndef LIBWCCL_OPS_FUNCTIONS_BOOL_PREDICATE_POINTAGREEMENT_H
 #define LIBWCCL_OPS_FUNCTIONS_BOOL_PREDICATE_POINTAGREEMENT_H
 
diff --git a/libwccl/ops/functions/bool/predicates/regex.cpp b/libwccl/ops/functions/bool/predicates/regex.cpp
index 69918330af4f4900e06492653105011360bd8960..9d0f7a72363871eaeafce53fbafbc824a78d819c 100644
--- a/libwccl/ops/functions/bool/predicates/regex.cpp
+++ b/libwccl/ops/functions/bool/predicates/regex.cpp
@@ -1,3 +1,20 @@
+/*
+    Copyright (C) 2011 Adam Wardyński, Tomasz Śniatowski, Paweł Kędzia,
+    Adam Radziszewski, Bartosz Broda
+    Part of the WCCL project
+
+    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 LICENSE and COPYING files for more details.
+*/
+
 #include <libwccl/ops/functions/bool/predicates/regex.h>
 #include <libpwrutils/foreach.h>
 
diff --git a/libwccl/ops/functions/bool/predicates/regex.h b/libwccl/ops/functions/bool/predicates/regex.h
index e32721e614248b898f712b2b1791d17d2f63d099..6a068ab2fe7c21fe982056d1ec89e41a70b49a66 100644
--- a/libwccl/ops/functions/bool/predicates/regex.h
+++ b/libwccl/ops/functions/bool/predicates/regex.h
@@ -1,3 +1,20 @@
+/*
+    Copyright (C) 2011 Adam Wardyński, Tomasz Śniatowski, Paweł Kędzia,
+    Adam Radziszewski, Bartosz Broda
+    Part of the WCCL project
+
+    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 LICENSE and COPYING files for more details.
+*/
+
 #ifndef LIBWCCL_OPS_FUNCTIONS_BOOL_PREDICATES_REGEX_H
 #define LIBWCCL_OPS_FUNCTIONS_BOOL_PREDICATES_REGEX_H
 
diff --git a/libwccl/ops/functions/bool/predicates/setpredicate.h b/libwccl/ops/functions/bool/predicates/setpredicate.h
index 863cac2a0a0ba71e6e5780ddd25fe495de475eca..30c0ca08183ac8b1b6d7eb2bf44f7a4a8ecf5e5b 100644
--- a/libwccl/ops/functions/bool/predicates/setpredicate.h
+++ b/libwccl/ops/functions/bool/predicates/setpredicate.h
@@ -1,3 +1,20 @@
+/*
+    Copyright (C) 2011 Adam Wardyński, Tomasz Śniatowski, Paweł Kędzia,
+    Adam Radziszewski, Bartosz Broda
+    Part of the WCCL project
+
+    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 LICENSE and COPYING files for more details.
+*/
+
 #ifndef LIBWCCL_OPS_FUNCTIONS_BOOL_PREDICATES_SETPREDICATE_H
 #define LIBWCCL_OPS_FUNCTIONS_BOOL_PREDICATES_SETPREDICATE_H
 
diff --git a/libwccl/ops/functions/bool/predicates/strongagreement.cpp b/libwccl/ops/functions/bool/predicates/strongagreement.cpp
index 908def3ac92bb55a0dcf23116b3f121e9645a38f..6ec70c6892647d73e4359f5d3dc724d0851c1485 100644
--- a/libwccl/ops/functions/bool/predicates/strongagreement.cpp
+++ b/libwccl/ops/functions/bool/predicates/strongagreement.cpp
@@ -1,3 +1,20 @@
+/*
+    Copyright (C) 2011 Adam Wardyński, Tomasz Śniatowski, Paweł Kędzia,
+    Adam Radziszewski, Bartosz Broda
+    Part of the WCCL project
+
+    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 LICENSE and COPYING files for more details.
+*/
+
 #include <libwccl/ops/functions/bool/predicates/strongagreement.h>
 #include <libpwrutils/foreach.h>
 
diff --git a/libwccl/ops/functions/bool/predicates/strongagreement.h b/libwccl/ops/functions/bool/predicates/strongagreement.h
index 3e215a511d32f5f19a60ddb2005799f04b06ede0..6eb97e68f9716af255a78a303e44ab7b333a6d85 100644
--- a/libwccl/ops/functions/bool/predicates/strongagreement.h
+++ b/libwccl/ops/functions/bool/predicates/strongagreement.h
@@ -1,3 +1,20 @@
+/*
+    Copyright (C) 2011 Adam Wardyński, Tomasz Śniatowski, Paweł Kędzia,
+    Adam Radziszewski, Bartosz Broda
+    Part of the WCCL project
+
+    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 LICENSE and COPYING files for more details.
+*/
+
 #ifndef LIBWCCL_OPS_FUNCTIONS_BOOL_PREDICATE_STRONGAGREEMENT_H
 #define LIBWCCL_OPS_FUNCTIONS_BOOL_PREDICATE_STRONGAGREEMENT_H
 
diff --git a/libwccl/ops/functions/bool/predicates/weakagreement.cpp b/libwccl/ops/functions/bool/predicates/weakagreement.cpp
index b7f4b6689ef3d1180637a8d4250ce869b0843df0..053dc0203da4d0a85846e9109e828cc73b0e7b44 100644
--- a/libwccl/ops/functions/bool/predicates/weakagreement.cpp
+++ b/libwccl/ops/functions/bool/predicates/weakagreement.cpp
@@ -1,3 +1,20 @@
+/*
+    Copyright (C) 2011 Adam Wardyński, Tomasz Śniatowski, Paweł Kędzia,
+    Adam Radziszewski, Bartosz Broda
+    Part of the WCCL project
+
+    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 LICENSE and COPYING files for more details.
+*/
+
 #include <libwccl/ops/functions/bool/predicates/weakagreement.h>
 #include <libpwrutils/foreach.h>
 
diff --git a/libwccl/ops/functions/bool/predicates/weakagreement.h b/libwccl/ops/functions/bool/predicates/weakagreement.h
index e8135ef289410df9748c141dc9828efed5591632..a1db5636e262ed467c6df4fc692bf74310f23beb 100644
--- a/libwccl/ops/functions/bool/predicates/weakagreement.h
+++ b/libwccl/ops/functions/bool/predicates/weakagreement.h
@@ -1,3 +1,20 @@
+/*
+    Copyright (C) 2011 Adam Wardyński, Tomasz Śniatowski, Paweł Kędzia,
+    Adam Radziszewski, Bartosz Broda
+    Part of the WCCL project
+
+    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 LICENSE and COPYING files for more details.
+*/
+
 #ifndef LIBWCCL_OPS_FUNCTIONS_BOOL_PREDICATE_WEAKAGREEMENT_H
 #define LIBWCCL_OPS_FUNCTIONS_BOOL_PREDICATE_WEAKAGREEMENT_H
 
diff --git a/libwccl/ops/functions/bool/varsetter.h b/libwccl/ops/functions/bool/varsetter.h
index 2d74ae98ac28719a04df3c63b15a4a336824fcf3..149f367cb720a05e56172cb46cfbf4c4d290a117 100644
--- a/libwccl/ops/functions/bool/varsetter.h
+++ b/libwccl/ops/functions/bool/varsetter.h
@@ -1,3 +1,20 @@
+/*
+    Copyright (C) 2011 Adam Wardyński, Tomasz Śniatowski, Paweł Kędzia,
+    Adam Radziszewski, Bartosz Broda
+    Part of the WCCL project
+
+    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 LICENSE and COPYING files for more details.
+*/
+
 #ifndef LIBWCCL_OPS_FUNCTIONS_BOOL_VARSETTER_H
 #define LIBWCCL_OPS_FUNCTIONS_BOOL_VARSETTER_H
 
diff --git a/libwccl/ops/functions/conditional.h b/libwccl/ops/functions/conditional.h
index ef040ea3960527a08b0bb3842506142b2d771d20..1cf74fef264a22df6a9cba8f76b7422160afe20b 100644
--- a/libwccl/ops/functions/conditional.h
+++ b/libwccl/ops/functions/conditional.h
@@ -1,3 +1,20 @@
+/*
+    Copyright (C) 2011 Adam Wardyński, Tomasz Śniatowski, Paweł Kędzia,
+    Adam Radziszewski, Bartosz Broda
+    Part of the WCCL project
+
+    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 LICENSE and COPYING files for more details.
+*/
+
 #ifndef LIBWCCL_OPS_FUNCTIONS_CONDITIONAL_H
 #define LIBWCCL_OPS_FUNCTIONS_CONDITIONAL_H
 
diff --git a/libwccl/ops/functions/constant.h b/libwccl/ops/functions/constant.h
index e196162eba46f6c9694e3d063eb0032d0818aa24..ba766f4f674239e1317cd0230cc6c7d2cf860af4 100644
--- a/libwccl/ops/functions/constant.h
+++ b/libwccl/ops/functions/constant.h
@@ -1,3 +1,20 @@
+/*
+    Copyright (C) 2011 Adam Wardyński, Tomasz Śniatowski, Paweł Kędzia,
+    Adam Radziszewski, Bartosz Broda
+    Part of the WCCL project
+
+    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 LICENSE and COPYING files for more details.
+*/
+
 #ifndef LIBWCCL_OPS_FUNCTIONS_CONSTANT_H
 #define LIBWCCL_OPS_FUNCTIONS_CONSTANT_H
 
diff --git a/libwccl/ops/functions/listoperator.h b/libwccl/ops/functions/listoperator.h
index 0e8c8ac78568c524be22728c72715c63aa0b5bd8..36d456a8db07074eebc0f19d42bd5d63cedf0bc5 100644
--- a/libwccl/ops/functions/listoperator.h
+++ b/libwccl/ops/functions/listoperator.h
@@ -1,3 +1,20 @@
+/*
+    Copyright (C) 2011 Adam Wardyński, Tomasz Śniatowski, Paweł Kędzia,
+    Adam Radziszewski, Bartosz Broda
+    Part of the WCCL project
+
+    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 LICENSE and COPYING files for more details.
+*/
+
 #ifndef LIBWCCL_OPS_FUNCTIONS_LISTOPERATOR_H
 #define LIBWCCL_OPS_FUNCTIONS_LISTOPERATOR_H
 
diff --git a/libwccl/ops/functions/match/submatch.cpp b/libwccl/ops/functions/match/submatch.cpp
index 3b25a0ea3f74bf908ee25ca5c5c8913d45ed1996..2bf2b788a9114a45dcb0a2b4aff7673a9f88451d 100644
--- a/libwccl/ops/functions/match/submatch.cpp
+++ b/libwccl/ops/functions/match/submatch.cpp
@@ -1,3 +1,20 @@
+/*
+    Copyright (C) 2011 Adam Wardyński, Tomasz Śniatowski, Paweł Kędzia,
+    Adam Radziszewski, Bartosz Broda
+    Part of the WCCL project
+
+    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 LICENSE and COPYING files for more details.
+*/
+
 #include <libwccl/ops/functions/match/submatch.h>
 #include <libwccl/ops/functions/vargetter.h>
 
diff --git a/libwccl/ops/functions/match/submatch.h b/libwccl/ops/functions/match/submatch.h
index d2eb03137225dd179131fd0d31c241211774f022..098a510cd52c0f66c25d861674f9f9d22e4c4d89 100644
--- a/libwccl/ops/functions/match/submatch.h
+++ b/libwccl/ops/functions/match/submatch.h
@@ -1,3 +1,20 @@
+/*
+    Copyright (C) 2011 Adam Wardyński, Tomasz Śniatowski, Paweł Kędzia,
+    Adam Radziszewski, Bartosz Broda
+    Part of the WCCL project
+
+    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 LICENSE and COPYING files for more details.
+*/
+
 #ifndef LIBWCCL_OPS_FUNCTIONS_MATCH_SUBMATCH_H
 #define LIBWCCL_OPS_FUNCTIONS_MATCH_SUBMATCH_H
 
diff --git a/libwccl/ops/functions/position/firsttoken.cpp b/libwccl/ops/functions/position/firsttoken.cpp
index b92b66d608574bf2488495d942219e5ca014f3e8..0d235282fcb274f500441c6ac866d78f4e36f1e6 100644
--- a/libwccl/ops/functions/position/firsttoken.cpp
+++ b/libwccl/ops/functions/position/firsttoken.cpp
@@ -1,3 +1,20 @@
+/*
+    Copyright (C) 2011 Adam Wardyński, Tomasz Śniatowski, Paweł Kędzia,
+    Adam Radziszewski, Bartosz Broda
+    Part of the WCCL project
+
+    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 LICENSE and COPYING files for more details.
+*/
+
 #include <libwccl/ops/functions/position/firsttoken.h>
 #include <libwccl/ops/functions/constant.h>
 #include <libwccl/exception.h>
diff --git a/libwccl/ops/functions/position/firsttoken.h b/libwccl/ops/functions/position/firsttoken.h
index 3081574ab4d1112bc787ef9636f8d6300db95df3..aa90276fcd648de0fed7eb42f3770c8254f32088 100644
--- a/libwccl/ops/functions/position/firsttoken.h
+++ b/libwccl/ops/functions/position/firsttoken.h
@@ -1,3 +1,20 @@
+/*
+    Copyright (C) 2011 Adam Wardyński, Tomasz Śniatowski, Paweł Kędzia,
+    Adam Radziszewski, Bartosz Broda
+    Part of the WCCL project
+
+    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 LICENSE and COPYING files for more details.
+*/
+
 #ifndef LIBWCCL_OPS_FUNCTIONS_POSITION_FIRSTTOKEN_H
 #define LIBWCCL_OPS_FUNCTIONS_POSITION_FIRSTTOKEN_H
 
diff --git a/libwccl/ops/functions/position/lasttoken.cpp b/libwccl/ops/functions/position/lasttoken.cpp
index 6b4f43ecd83251faf7a4cdadd6792b5bec953e0d..426ffde341448e645f6e81358085448009e95e28 100644
--- a/libwccl/ops/functions/position/lasttoken.cpp
+++ b/libwccl/ops/functions/position/lasttoken.cpp
@@ -1,3 +1,20 @@
+/*
+    Copyright (C) 2011 Adam Wardyński, Tomasz Śniatowski, Paweł Kędzia,
+    Adam Radziszewski, Bartosz Broda
+    Part of the WCCL project
+
+    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 LICENSE and COPYING files for more details.
+*/
+
 #include <libwccl/ops/functions/position/lasttoken.h>
 #include <libwccl/ops/functions/constant.h>
 #include <libwccl/exception.h>
diff --git a/libwccl/ops/functions/position/lasttoken.h b/libwccl/ops/functions/position/lasttoken.h
index 995949eb2f4abf468691e96fafe63897b94c8942..c9d530618d052c61491a5f602193a8e64dda470c 100644
--- a/libwccl/ops/functions/position/lasttoken.h
+++ b/libwccl/ops/functions/position/lasttoken.h
@@ -1,3 +1,20 @@
+/*
+    Copyright (C) 2011 Adam Wardyński, Tomasz Śniatowski, Paweł Kędzia,
+    Adam Radziszewski, Bartosz Broda
+    Part of the WCCL project
+
+    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 LICENSE and COPYING files for more details.
+*/
+
 #ifndef LIBWCCL_OPS_FUNCTIONS_POSITION_LASTTOKEN_H
 #define LIBWCCL_OPS_FUNCTIONS_POSITION_LASTTOKEN_H
 
diff --git a/libwccl/ops/functions/position/relativeposition.cpp b/libwccl/ops/functions/position/relativeposition.cpp
index 86e175990a3d84dafeaeecbac29195d0764b72fc..5b039d79c4cc62e8f645b2f0a4d8ed06cc64c50b 100644
--- a/libwccl/ops/functions/position/relativeposition.cpp
+++ b/libwccl/ops/functions/position/relativeposition.cpp
@@ -1,3 +1,20 @@
+/*
+    Copyright (C) 2011 Adam Wardyński, Tomasz Śniatowski, Paweł Kędzia,
+    Adam Radziszewski, Bartosz Broda
+    Part of the WCCL project
+
+    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 LICENSE and COPYING files for more details.
+*/
+
 #include <libwccl/ops/functions/position/relativeposition.h>
 #include <libwccl/ops/functions/constant.h>
 
diff --git a/libwccl/ops/functions/position/relativeposition.h b/libwccl/ops/functions/position/relativeposition.h
index f5786e3be311083f51c1f97db0b9eaf122c544e1..c42b003283ae9163bf8608593cefa030ff9905b8 100644
--- a/libwccl/ops/functions/position/relativeposition.h
+++ b/libwccl/ops/functions/position/relativeposition.h
@@ -1,3 +1,20 @@
+/*
+    Copyright (C) 2011 Adam Wardyński, Tomasz Śniatowski, Paweł Kędzia,
+    Adam Radziszewski, Bartosz Broda
+    Part of the WCCL project
+
+    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 LICENSE and COPYING files for more details.
+*/
+
 #ifndef LIBWCCL_OPS_FUNCTIONS_POSITION_RELATIVEPOSITION_H
 #define LIBWCCL_OPS_FUNCTIONS_POSITION_RELATIVEPOSITION_H
 
diff --git a/libwccl/ops/functions/setops.h b/libwccl/ops/functions/setops.h
index d53cedc3ea222b7a282ff21cf8fabb793d8b9b81..95883db4c782e8ff309c782b75c11d15f3cd7e4e 100644
--- a/libwccl/ops/functions/setops.h
+++ b/libwccl/ops/functions/setops.h
@@ -1,3 +1,20 @@
+/*
+    Copyright (C) 2011 Adam Wardyński, Tomasz Śniatowski, Paweł Kędzia,
+    Adam Radziszewski, Bartosz Broda
+    Part of the WCCL project
+
+    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 LICENSE and COPYING files for more details.
+*/
+
 #ifndef LIBWCCL_OPS_FUNCTIONS_SETOPS_H
 #define LIBWCCL_OPS_FUNCTIONS_SETOPS_H
 
diff --git a/libwccl/ops/functions/strset/affix.cpp b/libwccl/ops/functions/strset/affix.cpp
index eabfaaf6f9d9446f0294435d3523db47b1aa8fdc..82d83626cb3fe088d0923105dda9d4d5254a5bc3 100644
--- a/libwccl/ops/functions/strset/affix.cpp
+++ b/libwccl/ops/functions/strset/affix.cpp
@@ -1,3 +1,20 @@
+/*
+    Copyright (C) 2011 Adam Wardyński, Tomasz Śniatowski, Paweł Kędzia,
+    Adam Radziszewski, Bartosz Broda
+    Part of the WCCL project
+
+    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 LICENSE and COPYING files for more details.
+*/
+
 #include <libwccl/ops/functions/strset/affix.h>
 #include <libpwrutils/foreach.h>
 
diff --git a/libwccl/ops/functions/strset/affix.h b/libwccl/ops/functions/strset/affix.h
index ce6bd6f58133529c7b21aebc30ddad53962509b2..810f3125c54439a1817fb42027059bfc636ef8ae 100644
--- a/libwccl/ops/functions/strset/affix.h
+++ b/libwccl/ops/functions/strset/affix.h
@@ -1,3 +1,20 @@
+/*
+    Copyright (C) 2011 Adam Wardyński, Tomasz Śniatowski, Paweł Kędzia,
+    Adam Radziszewski, Bartosz Broda
+    Part of the WCCL project
+
+    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 LICENSE and COPYING files for more details.
+*/
+
 #ifndef LIBWCCL_OPS_FUNCTIONS_STRSET_AFFIX_H
 #define LIBWCCL_OPS_FUNCTIONS_STRSET_AFFIX_H
 
diff --git a/libwccl/ops/functions/strset/getlemmas.cpp b/libwccl/ops/functions/strset/getlemmas.cpp
index 51539438b050b2aac67c558bc925b2aae7b756d2..d17dfa49ae62086354e0f2808f73467764294dc4 100644
--- a/libwccl/ops/functions/strset/getlemmas.cpp
+++ b/libwccl/ops/functions/strset/getlemmas.cpp
@@ -1,3 +1,20 @@
+/*
+    Copyright (C) 2011 Adam Wardyński, Tomasz Śniatowski, Paweł Kędzia,
+    Adam Radziszewski, Bartosz Broda
+    Part of the WCCL project
+
+    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 LICENSE and COPYING files for more details.
+*/
+
 #include <libwccl/ops/functions/strset/getlemmas.h>
 #include <libwccl/ops/formatters.h>
 #include <libwccl/ops/functions/constant.h>
diff --git a/libwccl/ops/functions/strset/getlemmas.h b/libwccl/ops/functions/strset/getlemmas.h
index 3e473f383eb02563fd121b0383d3283960b4995d..6c36cbecb610fa40e75fec215f911435cdf8cede 100644
--- a/libwccl/ops/functions/strset/getlemmas.h
+++ b/libwccl/ops/functions/strset/getlemmas.h
@@ -1,3 +1,20 @@
+/*
+    Copyright (C) 2011 Adam Wardyński, Tomasz Śniatowski, Paweł Kędzia,
+    Adam Radziszewski, Bartosz Broda
+    Part of the WCCL project
+
+    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 LICENSE and COPYING files for more details.
+*/
+
 #ifndef LIBWCCL_OPS_FUNCTIONS_STRSET_GETBASE_H
 #define LIBWCCL_OPS_FUNCTIONS_STRSET_GETBASE_H
 
diff --git a/libwccl/ops/functions/strset/getorth.cpp b/libwccl/ops/functions/strset/getorth.cpp
index 33371c4e4e9e77ab045d9fc17645f8f04a24f75e..ebacb493ed3094c52f76acbc35c2166e25dd9eb8 100644
--- a/libwccl/ops/functions/strset/getorth.cpp
+++ b/libwccl/ops/functions/strset/getorth.cpp
@@ -1,3 +1,20 @@
+/*
+    Copyright (C) 2011 Adam Wardyński, Tomasz Śniatowski, Paweł Kędzia,
+    Adam Radziszewski, Bartosz Broda
+    Part of the WCCL project
+
+    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 LICENSE and COPYING files for more details.
+*/
+
 #include <libwccl/ops/functions/strset/getorth.h>
 #include <libwccl/ops/formatters.h>
 #include <libwccl/ops/functions/constant.h>
diff --git a/libwccl/ops/functions/strset/getorth.h b/libwccl/ops/functions/strset/getorth.h
index 2308629bf0fc4b9f02a069bd0a675705c039a265..b9f530f19dae65d31bbd4aeab898743af2916c82 100644
--- a/libwccl/ops/functions/strset/getorth.h
+++ b/libwccl/ops/functions/strset/getorth.h
@@ -1,3 +1,20 @@
+/*
+    Copyright (C) 2011 Adam Wardyński, Tomasz Śniatowski, Paweł Kędzia,
+    Adam Radziszewski, Bartosz Broda
+    Part of the WCCL project
+
+    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 LICENSE and COPYING files for more details.
+*/
+
 #ifndef LIBWCCL_OPS_FUNCTIONS_STRSET_GETORTH_H
 #define LIBWCCL_OPS_FUNCTIONS_STRSET_GETORTH_H
 
diff --git a/libwccl/ops/functions/strset/lextranslator.cpp b/libwccl/ops/functions/strset/lextranslator.cpp
index 424520b4b69e2c6e4ccc44569fa30eb1623d05bd..4eb552cd0fc91637c797a8462c9b3f038dddad21 100644
--- a/libwccl/ops/functions/strset/lextranslator.cpp
+++ b/libwccl/ops/functions/strset/lextranslator.cpp
@@ -1,3 +1,20 @@
+/*
+    Copyright (C) 2011 Adam Wardyński, Tomasz Śniatowski, Paweł Kędzia,
+    Adam Radziszewski, Bartosz Broda
+    Part of the WCCL project
+
+    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 LICENSE and COPYING files for more details.
+*/
+
 #include <libwccl/ops/functions/strset/lextranslator.h>
 #include <sstream>
 
diff --git a/libwccl/ops/functions/strset/lextranslator.h b/libwccl/ops/functions/strset/lextranslator.h
index 4cfab9d8d8c3f4cc13b8566ede5ce3415d4a3288..bc32326a7c846ed2a3176103c1dd386640414d58 100644
--- a/libwccl/ops/functions/strset/lextranslator.h
+++ b/libwccl/ops/functions/strset/lextranslator.h
@@ -1,3 +1,20 @@
+/*
+    Copyright (C) 2011 Adam Wardyński, Tomasz Śniatowski, Paweł Kędzia,
+    Adam Radziszewski, Bartosz Broda
+    Part of the WCCL project
+
+    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 LICENSE and COPYING files for more details.
+*/
+
 #ifndef LIBWCCL_OPS_FUNCTIONS_STRSET_LEXTRANSLATOR_H
 #define LIBWCCL_OPS_FUNCTIONS_STRSET_LEXTRANSLATOR_H
 
diff --git a/libwccl/ops/functions/strset/tolower.cpp b/libwccl/ops/functions/strset/tolower.cpp
index 36d54cf4b58f50fa79eb6f481d882baa2fec83bb..a13edaa74d7f07586d11cf172adb49accf6a3c0a 100644
--- a/libwccl/ops/functions/strset/tolower.cpp
+++ b/libwccl/ops/functions/strset/tolower.cpp
@@ -1,3 +1,20 @@
+/*
+    Copyright (C) 2011 Adam Wardyński, Tomasz Śniatowski, Paweł Kędzia,
+    Adam Radziszewski, Bartosz Broda
+    Part of the WCCL project
+
+    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 LICENSE and COPYING files for more details.
+*/
+
 #include <libwccl/ops/functions/strset/tolower.h>
 #include <libwccl/ops/formatters.h>
 
diff --git a/libwccl/ops/functions/strset/tolower.h b/libwccl/ops/functions/strset/tolower.h
index f46e568cc4a4b80a0d6de3fe1ccbbf4cd3de5ca8..77e1a28838a81798f86d7cdabe9d68976062dce0 100644
--- a/libwccl/ops/functions/strset/tolower.h
+++ b/libwccl/ops/functions/strset/tolower.h
@@ -1,3 +1,20 @@
+/*
+    Copyright (C) 2011 Adam Wardyński, Tomasz Śniatowski, Paweł Kędzia,
+    Adam Radziszewski, Bartosz Broda
+    Part of the WCCL project
+
+    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 LICENSE and COPYING files for more details.
+*/
+
 #ifndef LIBWCCL_OPS_FUNCTIONS_STRSET_TOLOWER_H
 #define LIBWCCL_OPS_FUNCTIONS_STRSET_TOLOWER_H
 
diff --git a/libwccl/ops/functions/strset/toupper.cpp b/libwccl/ops/functions/strset/toupper.cpp
index 09c8c8e2ef84662431bae77723eb4c216e5d268d..08a778936cc94c6e67287edb7f7033a71e13b2a6 100644
--- a/libwccl/ops/functions/strset/toupper.cpp
+++ b/libwccl/ops/functions/strset/toupper.cpp
@@ -1,3 +1,20 @@
+/*
+    Copyright (C) 2011 Adam Wardyński, Tomasz Śniatowski, Paweł Kędzia,
+    Adam Radziszewski, Bartosz Broda
+    Part of the WCCL project
+
+    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 LICENSE and COPYING files for more details.
+*/
+
 #include <libwccl/ops/functions/strset/toupper.h>
 #include <libwccl/ops/formatters.h>
 
diff --git a/libwccl/ops/functions/strset/toupper.h b/libwccl/ops/functions/strset/toupper.h
index 0009ba14a2238d88e6a46df514ff08ff5a907df2..e25cfbc31e6dc176dfdddb3ae3c7ec8fa1deaa67 100644
--- a/libwccl/ops/functions/strset/toupper.h
+++ b/libwccl/ops/functions/strset/toupper.h
@@ -1,3 +1,20 @@
+/*
+    Copyright (C) 2011 Adam Wardyński, Tomasz Śniatowski, Paweł Kędzia,
+    Adam Radziszewski, Bartosz Broda
+    Part of the WCCL project
+
+    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 LICENSE and COPYING files for more details.
+*/
+
 #ifndef LIBWCCL_OPS_FUNCTIONS_STRSET_TOUPPER_H
 #define LIBWCCL_OPS_FUNCTIONS_STRSET_TOUPPER_H
 
diff --git a/libwccl/ops/functions/tset/agrfilter.cpp b/libwccl/ops/functions/tset/agrfilter.cpp
index ef56fa5ad641287903f4e8033b3760e78eab1171..1be3379062d29f63c09064ec1d8631e5337557ec 100644
--- a/libwccl/ops/functions/tset/agrfilter.cpp
+++ b/libwccl/ops/functions/tset/agrfilter.cpp
@@ -1,3 +1,20 @@
+/*
+    Copyright (C) 2011 Adam Wardyński, Tomasz Śniatowski, Paweł Kędzia,
+    Adam Radziszewski, Bartosz Broda
+    Part of the WCCL project
+
+    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 LICENSE and COPYING files for more details.
+*/
+
 #include <libwccl/ops/functions/tset/agrfilter.h>
 #include <libwccl/ops/functions/constant.h>
 
diff --git a/libwccl/ops/functions/tset/agrfilter.h b/libwccl/ops/functions/tset/agrfilter.h
index d41d4c63980b29d0c676071e8b206745ffb351e2..4dfb4c3781a54e82d9ecb1c62746fc52c2068250 100644
--- a/libwccl/ops/functions/tset/agrfilter.h
+++ b/libwccl/ops/functions/tset/agrfilter.h
@@ -1,3 +1,20 @@
+/*
+    Copyright (C) 2011 Adam Wardyński, Tomasz Śniatowski, Paweł Kędzia,
+    Adam Radziszewski, Bartosz Broda
+    Part of the WCCL project
+
+    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 LICENSE and COPYING files for more details.
+*/
+
 #ifndef LIBWCCL_OPS_FUNCTIONS_TSET_AGRFILTER_H
 #define LIBWCCL_OPS_FUNCTIONS_TSET_AGRFILTER_H
 
diff --git a/libwccl/ops/functions/tset/catfilter.cpp b/libwccl/ops/functions/tset/catfilter.cpp
index b5e1b24e94c1f6d78a0509ad12a9d62d07bca493..4d62aae95dcc95bd91fd98553b18bfb6f67ece06 100644
--- a/libwccl/ops/functions/tset/catfilter.cpp
+++ b/libwccl/ops/functions/tset/catfilter.cpp
@@ -1,3 +1,20 @@
+/*
+    Copyright (C) 2011 Adam Wardyński, Tomasz Śniatowski, Paweł Kędzia,
+    Adam Radziszewski, Bartosz Broda
+    Part of the WCCL project
+
+    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 LICENSE and COPYING files for more details.
+*/
+
 #include <libwccl/ops/functions/tset/catfilter.h>
 #include <libwccl/ops/functions/constant.h>
 
diff --git a/libwccl/ops/functions/tset/catfilter.h b/libwccl/ops/functions/tset/catfilter.h
index 71519baea5cab344e13b3f9fef24a2ac8097c7d9..d352b814d4b27a0f144d386635508cccbff25951 100644
--- a/libwccl/ops/functions/tset/catfilter.h
+++ b/libwccl/ops/functions/tset/catfilter.h
@@ -1,3 +1,20 @@
+/*
+    Copyright (C) 2011 Adam Wardyński, Tomasz Śniatowski, Paweł Kędzia,
+    Adam Radziszewski, Bartosz Broda
+    Part of the WCCL project
+
+    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 LICENSE and COPYING files for more details.
+*/
+
 #ifndef LIBWCCL_OPS_FUNCTIONS_TSET_CATFILTER_H
 #define LIBWCCL_OPS_FUNCTIONS_TSET_CATFILTER_H
 
diff --git a/libwccl/ops/functions/tset/getsymbols.cpp b/libwccl/ops/functions/tset/getsymbols.cpp
index d23f6ec3140f6b5972a5f7282bd1ce0cb32c2e88..af2e7698395f097e3ba2c3c72afe6cca0b799783 100644
--- a/libwccl/ops/functions/tset/getsymbols.cpp
+++ b/libwccl/ops/functions/tset/getsymbols.cpp
@@ -1,3 +1,20 @@
+/*
+    Copyright (C) 2011 Adam Wardyński, Tomasz Śniatowski, Paweł Kędzia,
+    Adam Radziszewski, Bartosz Broda
+    Part of the WCCL project
+
+    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 LICENSE and COPYING files for more details.
+*/
+
 #include <libwccl/ops/functions/tset/getsymbols.h>
 #include <libwccl/ops/formatters.h>
 #include <libwccl/ops/functions/constant.h>
diff --git a/libwccl/ops/functions/tset/getsymbols.h b/libwccl/ops/functions/tset/getsymbols.h
index a62300dfe2b91c148217944c0857e7cf12a31888..1a02ca745770a49dae17295e9ab15530c059abed 100644
--- a/libwccl/ops/functions/tset/getsymbols.h
+++ b/libwccl/ops/functions/tset/getsymbols.h
@@ -1,3 +1,20 @@
+/*
+    Copyright (C) 2011 Adam Wardyński, Tomasz Śniatowski, Paweł Kędzia,
+    Adam Radziszewski, Bartosz Broda
+    Part of the WCCL project
+
+    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 LICENSE and COPYING files for more details.
+*/
+
 #ifndef LIBWCCL_OPS_FUNCTIONS_TSET_GETSYMBOLS_H
 #define LIBWCCL_OPS_FUNCTIONS_TSET_GETSYMBOLS_H
 
diff --git a/libwccl/ops/functions/tset/getsymbolsinrange.cpp b/libwccl/ops/functions/tset/getsymbolsinrange.cpp
index 2897b69ed63b72bde2d79676fbfc07a52375ec00..969bd0eb1f0008df1a285aeeaae2d1e1d39b2f69 100644
--- a/libwccl/ops/functions/tset/getsymbolsinrange.cpp
+++ b/libwccl/ops/functions/tset/getsymbolsinrange.cpp
@@ -1,3 +1,20 @@
+/*
+    Copyright (C) 2011 Adam Wardyński, Tomasz Śniatowski, Paweł Kędzia,
+    Adam Radziszewski, Bartosz Broda
+    Part of the WCCL project
+
+    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 LICENSE and COPYING files for more details.
+*/
+
 #include <libwccl/ops/functions/tset/getsymbolsinrange.h>
 #include <libwccl/ops/functions/constant.h>
 
diff --git a/libwccl/ops/functions/tset/getsymbolsinrange.h b/libwccl/ops/functions/tset/getsymbolsinrange.h
index 911e1031892af26fbd2cd4be28d6096667205274..bd7be8fd988c532885455caecff4c60f80b1a74c 100644
--- a/libwccl/ops/functions/tset/getsymbolsinrange.h
+++ b/libwccl/ops/functions/tset/getsymbolsinrange.h
@@ -1,3 +1,20 @@
+/*
+    Copyright (C) 2011 Adam Wardyński, Tomasz Śniatowski, Paweł Kędzia,
+    Adam Radziszewski, Bartosz Broda
+    Part of the WCCL project
+
+    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 LICENSE and COPYING files for more details.
+*/
+
 #ifndef LIBWCCL_OPS_FUNCTIONS_TSET_GETSYMBOLSINRANGE_H
 #define LIBWCCL_OPS_FUNCTIONS_TSET_GETSYMBOLSINRANGE_H
 
diff --git a/libwccl/ops/functions/tset/getwordclass.h b/libwccl/ops/functions/tset/getwordclass.h
index 0efff88380c3d4c4bccd0398a682f0d8a5d1e799..84ac4749cd70737138a42060038c74c56d95aa10 100644
--- a/libwccl/ops/functions/tset/getwordclass.h
+++ b/libwccl/ops/functions/tset/getwordclass.h
@@ -1,3 +1,20 @@
+/*
+    Copyright (C) 2011 Adam Wardyński, Tomasz Śniatowski, Paweł Kędzia,
+    Adam Radziszewski, Bartosz Broda
+    Part of the WCCL project
+
+    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 LICENSE and COPYING files for more details.
+*/
+
 #ifndef LIBWCCL_OPS_FUNCTIONS_TSET_GETWORDCLASS_H
 #define LIBWCCL_OPS_FUNCTIONS_TSET_GETWORDCLASS_H
 
@@ -14,7 +31,7 @@ public:
 	typedef boost::shared_ptr<Function<Position> > PosFunctionPtr;
 
 	GetWordClass(const PosFunctionPtr& pos_expr)
-		: GetSymbols(Corpus2::Tag(-1), pos_expr)
+		: GetSymbols(Corpus2::Tag::all_pos_mask, pos_expr)
 	{
 	}
 
diff --git a/libwccl/ops/functions/vargetter.h b/libwccl/ops/functions/vargetter.h
index 53d1d33feaca00eb761f0dfd866647564eb3caf9..7a4157b974e5a34080171d04aba97913b69536e6 100644
--- a/libwccl/ops/functions/vargetter.h
+++ b/libwccl/ops/functions/vargetter.h
@@ -1,3 +1,20 @@
+/*
+    Copyright (C) 2011 Adam Wardyński, Tomasz Śniatowski, Paweł Kędzia,
+    Adam Radziszewski, Bartosz Broda
+    Part of the WCCL project
+
+    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 LICENSE and COPYING files for more details.
+*/
+
 #ifndef LIBWCCL_OPS_FUNCTIONS_VARGETTER_H
 #define LIBWCCL_OPS_FUNCTIONS_VARGETTER_H
 
diff --git a/libwccl/ops/funexeccontext.h b/libwccl/ops/funexeccontext.h
index 43e039cb116888d7c4133491ca3e35fefed3de21..8b56ad8927974c69f9b0f760178d33cb1c19d82a 100644
--- a/libwccl/ops/funexeccontext.h
+++ b/libwccl/ops/funexeccontext.h
@@ -1,3 +1,20 @@
+/*
+    Copyright (C) 2011 Adam Wardyński, Tomasz Śniatowski, Paweł Kędzia,
+    Adam Radziszewski, Bartosz Broda
+    Part of the WCCL project
+
+    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 LICENSE and COPYING files for more details.
+*/
+
 #ifndef LIBWCCL_OPS_FUNEXECCONTEXT_H
 #define LIBWCCL_OPS_FUNEXECCONTEXT_H
 
diff --git a/libwccl/ops/match/actions/markbase.cpp b/libwccl/ops/match/actions/markbase.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..783dcc3c82f5f20db0594ad05a9f274bffa6e056
--- /dev/null
+++ b/libwccl/ops/match/actions/markbase.cpp
@@ -0,0 +1,126 @@
+/*
+    Copyright (C) 2011 Adam Wardyński, Tomasz Śniatowski, Paweł Kędzia,
+    Adam Radziszewski, Bartosz Broda
+    Part of the WCCL project
+
+    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 LICENSE and COPYING files for more details.
+*/
+
+#include <libwccl/values/match.h>
+#include <libwccl/ops/match/actions/markmatch.h>
+
+#include <sstream>
+
+
+namespace Wccl {
+namespace Matching {
+
+void MarkBase::execute_mark(const ActionExecContext& context,
+							bool may_overwrite) const
+{
+	// TODO may overwrite, use it in mark_mark and perhaps move fields back to private
+	SentenceContext& sc = context.sentence_context();
+	boost::shared_ptr<Corpus2::AnnotatedSentence> as;
+	as = boost::dynamic_pointer_cast<Corpus2::AnnotatedSentence>(sc.get_sentence_ptr());
+	if (!as) {
+		throw InvalidArgument("context", "Operator needs an annotated sentence.");
+	}
+
+	boost::shared_ptr<const Match> match_from = match_from_->apply(context);
+	boost::shared_ptr<const Match> match_to =
+		(match_from_ == match_to_) ? match_from : match_to_->apply(context);
+	boost::shared_ptr<const Match> head_match =
+		(match_from_ == head_match_) ? match_from : head_match_->apply(context);
+
+	int abs_left = match_from->first_token(as);
+	if (abs_left < 0) {
+		throw WcclError("Received starting match that points outside sentence.");
+	}
+
+	int abs_right = match_to->last_token(as);
+	if (abs_right >= sc.size()) {
+		throw WcclError("Received ending match that points outside sentence.");
+	}
+	if (abs_left > abs_right) {
+		throw WcclError("Received starting match points after the received ending match.");
+	}
+
+	int abs_head = head_match->first_token(as);
+	if (abs_head < abs_left || abs_head > abs_right) {
+		throw WcclError("Received head match points outside range defined by start and end matches.");
+	}
+
+	if (!as->has_channel(chan_name_)) {
+		as->create_channel(chan_name_);
+	}
+	Corpus2::AnnotationChannel& channel = as->get_channel(chan_name_);
+
+	int segment_idx = channel.get_new_segment_index();
+
+	if (may_overwrite) {
+		std::set<int> segments_to_unmark;
+		for (int i = abs_left; i <= abs_right; ++i) {
+			if (channel.get_segment_at(i) > 0) {
+				segments_to_unmark.insert(channel.get_segment_at(i));
+			}
+		}
+		if (!segments_to_unmark.empty()) {
+			// unmark all the segments that appeared within the range
+			for (int i = 0; i < channel.size(); ++i) {
+				if (segments_to_unmark.find(channel.segments()[i]) !=
+						segments_to_unmark.end()) {
+					channel.set_segment_at(i, 0);
+					channel.set_head_at(i, false);
+				}
+			}
+		}
+	}
+	else {
+		for (int i = abs_left; i <= abs_right; ++i) {
+			if (channel.get_segment_at(i) > 0) {
+				throw WcclError("Mark action would overwrite existing annotation");
+			}
+		}
+	}
+	// mark new one
+	for (int i = abs_left; i <= abs_right; ++i) {
+		channel.set_segment_at(i, segment_idx);
+		channel.set_head_at(i, false);
+	}
+	channel.set_head_at(abs_head, true);
+}
+
+std::string MarkBase::to_string(const Corpus2::Tagset& tagset) const
+{
+	std::ostringstream os;
+	os << name() << "("
+			<< match_from_->to_string(tagset) << ", ";
+	if (match_from_.get() != match_to_.get()) {
+		os << match_to_->to_string(tagset) << ", ";
+	}
+	os << "\"" << chan_name_ << "\")";
+	return os.str();
+}
+
+std::ostream& MarkBase::write_to(std::ostream& os) const
+{
+	os << name() << "("
+			<< *match_from_ << ", ";
+	if (match_from_.get() != match_to_.get()) {
+		os << *match_to_ << ", ";
+	}
+	os << "\"" << chan_name_ << "\")";
+	return os;
+}
+
+} /* end ns Matching */
+} /* end ns Wccl */
diff --git a/libwccl/ops/match/actions/markbase.h b/libwccl/ops/match/actions/markbase.h
new file mode 100644
index 0000000000000000000000000000000000000000..58748122b43ba5290bae360b209aabebd2dc03ab
--- /dev/null
+++ b/libwccl/ops/match/actions/markbase.h
@@ -0,0 +1,80 @@
+/*
+    Copyright (C) 2011 Adam Wardyński, Tomasz Śniatowski, Paweł Kędzia,
+    Adam Radziszewski, Bartosz Broda
+    Part of the WCCL project
+
+    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 LICENSE and COPYING files for more details.
+*/
+
+#ifndef LIBWCCL_OPS_MATCH_ACTIONS_MARKBASE_H
+#define LIBWCCL_OPS_MATCH_ACTIONS_MARKBASE_H
+
+
+#include <libwccl/ops/match/matchaction.h>
+#include <libwccl/ops/function.h>
+
+namespace Wccl {
+namespace Matching {
+
+class MarkBase : public MatchAction
+{
+public:
+	MarkBase(
+			const boost::shared_ptr<Function<Match> >& match_from,
+			const boost::shared_ptr<Function<Match> >& match_to,
+			const boost::shared_ptr<Function<Match> >& head_match,
+			const std::string& annotation_name)
+		: match_from_(match_from),
+		  match_to_(match_to),
+		  head_match_(head_match),
+		  chan_name_(annotation_name)
+	{
+		BOOST_ASSERT(match_from_);
+		BOOST_ASSERT(match_to_);
+		BOOST_ASSERT(head_match_);
+	}
+
+	virtual std::string name() const = 0;
+
+	/**
+	 * Executes the action for the given execution context.
+	 */
+	virtual void execute(const ActionExecContext& context) const = 0;
+
+	std::string to_string(const Corpus2::Tagset& tagset) const;
+
+protected:
+	const boost::shared_ptr<Function<Match> > match_from_;
+	const boost::shared_ptr<Function<Match> > match_to_;
+	const boost::shared_ptr<Function<Match> > head_match_;
+	const std::string chan_name_;
+
+	/**
+	 * Writes string representation of the MatchAction to
+	 * an output stream.
+	 * @returns Stream written to.
+	 * @note May be incomplete and/or containt internal info.
+	 */
+	virtual std::ostream& write_to(std::ostream& ostream) const;
+
+	/**
+	  * The actual implementation. Depending on may_overwrite, will either
+	  * remove any previous annotations in the range given or will raise
+	  * an exception if any annotations present. */
+	void execute_mark(const ActionExecContext& context, bool may_overwrite)
+			const;
+};
+
+} /* end ns Matching */
+} /* end ns Wccl */
+
+#endif // LIBWCCL_OPS_MATCH_ACTIONS_MARKBASE_H
diff --git a/libwccl/ops/match/actions/markmatch.cpp b/libwccl/ops/match/actions/markmatch.cpp
index 2a113abf7de17c32a95ea3227d54e1de5d867775..695b8e319e7f6f1d69ca9116535d6967142981a1 100644
--- a/libwccl/ops/match/actions/markmatch.cpp
+++ b/libwccl/ops/match/actions/markmatch.cpp
@@ -1,4 +1,20 @@
-#include <libwccl/values/match.h>
+/*
+    Copyright (C) 2011 Adam Wardyński, Tomasz Śniatowski, Paweł Kędzia,
+    Adam Radziszewski, Bartosz Broda
+    Part of the WCCL project
+
+    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 LICENSE and COPYING files for more details.
+*/
+
 #include <libwccl/ops/match/actions/markmatch.h>
 
 #include <sstream>
@@ -9,77 +25,8 @@ namespace Matching {
 
 void MarkMatch::execute(const ActionExecContext& context) const
 {
-	SentenceContext& sc = context.sentence_context();
-	boost::shared_ptr<Corpus2::AnnotatedSentence> as;
-	as = boost::dynamic_pointer_cast<Corpus2::AnnotatedSentence>(sc.get_sentence_ptr());
-	if (!as) {
-		throw InvalidArgument("context", "Operator needs an annotated sentence.");
-	}
-
-	boost::shared_ptr<const Match> match_from = match_from_->apply(context);
-	boost::shared_ptr<const Match> match_to =
-		(match_from_ == match_to_) ? match_from : match_to_->apply(context);
-	boost::shared_ptr<const Match> head_match =
-		(match_from_ == head_match_) ? match_from : head_match_->apply(context);
-
-	int abs_left = match_from->first_token(as);
-	if (abs_left < 0) {
-		throw WcclError("Received starting match that points outside sentence.");
-	}
-
-	int abs_right = match_to->last_token(as);
-	if (abs_right >= sc.size()) {
-		throw WcclError("Received ending match that points outside sentence.");
-	}
-	if (abs_left > abs_right) {
-		throw WcclError("Received starting match points after the received ending match.");
-	}
-
-	int abs_head = head_match->first_token(as);
-	if (abs_head < abs_left || abs_head > abs_right) {
-		throw WcclError("Received head match points outside range defined by start and end matches.");
-	}
-
-	if (!as->has_channel(chan_name_)) {
-		as->create_channel(chan_name_);
-	}
-	Corpus2::AnnotationChannel& channel = as->get_channel(chan_name_);
-
-	int segment_idx = channel.get_new_segment_index();
-
-	for (int i = abs_left; i <= abs_right; ++i) {
-		if (channel.get_segment_at(i) > 0) {
-			throw WcclError("Mark action would overwrite existing annotation");
-		}
-	}
-	for (int i = abs_left; i <= abs_right; ++i) {
-		channel.set_segment_at(i, segment_idx);
-		channel.set_head_at(i, false);
-	}
-	channel.set_head_at(abs_head, true);
-}
-
-std::string MarkMatch::to_string(const Corpus2::Tagset& tagset) const
-{
-	std::ostringstream os;
-	os << name() << "("
-			<< match_from_->to_string(tagset) << ", ";
-	if (match_from_.get() != match_to_.get()) {
-		os << match_to_->to_string(tagset) << ", ";
-	}
-	os << "\"" << chan_name_ << "\")";
-	return os.str();
-}
-
-std::ostream& MarkMatch::write_to(std::ostream& os) const
-{
-	os << name() << "("
-			<< *match_from_ << ", ";
-	if (match_from_.get() != match_to_.get()) {
-		os << *match_to_ << ", ";
-	}
-	os << "\"" << chan_name_ << "\")";
-	return os;
+	// fire inner execute in fail-on-annotation-overwrite mode
+	execute_mark(context, false);
 }
 
 } /* end ns Matching */
diff --git a/libwccl/ops/match/actions/markmatch.h b/libwccl/ops/match/actions/markmatch.h
index 514ec19e8c05358068a906a5b247424567d7994a..5b6117bd7fa41b8aa3c8a35502c722250f4e974d 100644
--- a/libwccl/ops/match/actions/markmatch.h
+++ b/libwccl/ops/match/actions/markmatch.h
@@ -1,13 +1,29 @@
+/*
+    Copyright (C) 2011 Adam Wardyński, Tomasz Śniatowski, Paweł Kędzia,
+    Adam Radziszewski, Bartosz Broda
+    Part of the WCCL project
+
+    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 LICENSE and COPYING files for more details.
+*/
+
 #ifndef LIBWCCL_OPS_MATCH_ACTIONS_MARKMATCH_H
 #define LIBWCCL_OPS_MATCH_ACTIONS_MARKMATCH_H
 
-#include <libwccl/ops/match/matchaction.h>
-#include <libwccl/ops/function.h>
+#include <libwccl/ops/match/actions/markbase.h>
 
 namespace Wccl {
 namespace Matching {
 
-class MarkMatch : public MatchAction
+class MarkMatch : public MarkBase
 {
 public:
 	MarkMatch(
@@ -15,42 +31,25 @@ public:
 			const boost::shared_ptr<Function<Match> >& match_to,
 			const boost::shared_ptr<Function<Match> >& head_match,
 			const std::string& annotation_name)
-		: match_from_(match_from),
-		  match_to_(match_to),
-		  head_match_(head_match),
-		  chan_name_(annotation_name)
+		: MarkBase(match_from, match_to, head_match, annotation_name)
 	{
-		BOOST_ASSERT(match_from_);
-		BOOST_ASSERT(match_to_);
-		BOOST_ASSERT(head_match_);
 	}
 
 	MarkMatch(
 			const boost::shared_ptr<Function<Match> >& match_from,
 			const boost::shared_ptr<Function<Match> >& match_to,
 			const std::string& annotation_name)
-		: match_from_(match_from),
-		  match_to_(match_to),
-		  head_match_(match_from),
-		  chan_name_(annotation_name)
+		: MarkBase(match_from, match_to, match_from, annotation_name)
 	{
-		BOOST_ASSERT(match_from_);
-		BOOST_ASSERT(match_to_);
-		BOOST_ASSERT(head_match_);
 	}
 
 	MarkMatch(
 			const boost::shared_ptr<Function<Match> >& match_from_to,
 			const std::string& annotation_name)
-		: match_from_(match_from_to),
-		  match_to_(match_from_to),
-		  head_match_(match_from_to),
-		  chan_name_(annotation_name)
+		: MarkBase(match_from_to, match_from_to, match_from_to, annotation_name)
 	{
-		BOOST_ASSERT(match_from_);
-		BOOST_ASSERT(match_to_);
-		BOOST_ASSERT(head_match_);
 	}
+
 	/**
 	 * @returns Name of the action.
 	 */
@@ -62,25 +61,6 @@ public:
 	 * Executes the action for the given execution context.
 	 */
 	void execute(const ActionExecContext& context) const;
-
-	/**
-	 * @returns String representation of the expression.
-	 */
-	std::string to_string(const Corpus2::Tagset& tagset) const;
-
-protected:
-	/**
-	 * Writes string representation of the MatchAction to
-	 * an output stream.
-	 * @returns Stream written to.
-	 * @note May be incomplete and/or containt internal info.
-	 */
-	virtual std::ostream& write_to(std::ostream& ostream) const;
-private:
-	const boost::shared_ptr<Function<Match> > match_from_;
-	const boost::shared_ptr<Function<Match> > match_to_;
-	const boost::shared_ptr<Function<Match> > head_match_;
-	const std::string chan_name_;
 };
 
 } /* end ns Matching */
diff --git a/libwccl/ops/match/actions/overwritematch.cpp b/libwccl/ops/match/actions/overwritematch.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..1ae458ec862e3ce2e5d28e614c9f68885360f244
--- /dev/null
+++ b/libwccl/ops/match/actions/overwritematch.cpp
@@ -0,0 +1,33 @@
+/*
+    Copyright (C) 2011 Adam Wardyński, Tomasz Śniatowski, Paweł Kędzia,
+    Adam Radziszewski, Bartosz Broda
+    Part of the WCCL project
+
+    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 LICENSE and COPYING files for more details.
+*/
+
+#include <libwccl/ops/match/actions/overwritematch.h>
+
+#include <sstream>
+
+
+namespace Wccl {
+namespace Matching {
+
+void OverwriteMatch::execute(const ActionExecContext& context) const
+{
+	// fire inner execute in silent-overwrite mode
+	execute_mark(context, true);
+}
+
+} /* end ns Matching */
+} /* end ns Wccl */
diff --git a/libwccl/ops/match/actions/overwritematch.h b/libwccl/ops/match/actions/overwritematch.h
new file mode 100644
index 0000000000000000000000000000000000000000..6a60c6682e980778913774bbf34a92f79c520da3
--- /dev/null
+++ b/libwccl/ops/match/actions/overwritematch.h
@@ -0,0 +1,69 @@
+/*
+    Copyright (C) 2011 Adam Wardyński, Tomasz Śniatowski, Paweł Kędzia,
+    Adam Radziszewski, Bartosz Broda
+    Part of the WCCL project
+
+    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 LICENSE and COPYING files for more details.
+*/
+
+#ifndef LIBWCCL_OPS_MATCH_ACTIONS_OVERWRITEMATCH_H
+#define LIBWCCL_OPS_MATCH_ACTIONS_OVERWRITEMATCH_H
+
+#include <libwccl/ops/match/actions/markbase.h>
+
+namespace Wccl {
+namespace Matching {
+
+class OverwriteMatch : public MarkBase
+{
+public:
+	OverwriteMatch(
+			const boost::shared_ptr<Function<Match> >& match_from,
+			const boost::shared_ptr<Function<Match> >& match_to,
+			const boost::shared_ptr<Function<Match> >& head_match,
+			const std::string& annotation_name)
+		: MarkBase(match_from, match_to, head_match, annotation_name)
+	{
+	}
+
+	OverwriteMatch(
+			const boost::shared_ptr<Function<Match> >& match_from,
+			const boost::shared_ptr<Function<Match> >& match_to,
+			const std::string& annotation_name)
+		: MarkBase(match_from, match_to, match_from, annotation_name)
+	{
+	}
+
+	OverwriteMatch(
+			const boost::shared_ptr<Function<Match> >& match_from_to,
+			const std::string& annotation_name)
+		: MarkBase(match_from_to, match_from_to, match_from_to, annotation_name)
+	{
+	}
+
+	/**
+	 * @returns Name of the action.
+	 */
+	std::string name() const {
+		return "remark";
+	}
+
+	/**
+	 * Executes the action for the given execution context.
+	 */
+	void execute(const ActionExecContext& context) const;
+};
+
+} /* end ns Matching */
+} /* end ns Wccl */
+
+#endif // LIBWCCL_OPS_MATCH_ACTIONS_OVERWRITEMATCH_H
diff --git a/libwccl/ops/match/actions/unmarkmatch.cpp b/libwccl/ops/match/actions/unmarkmatch.cpp
index 7e7926e58d2f90f32f4c310b71e6a63020cec0ab..02d70239cee59c34acc654b7d67af896f73e05a2 100644
--- a/libwccl/ops/match/actions/unmarkmatch.cpp
+++ b/libwccl/ops/match/actions/unmarkmatch.cpp
@@ -1,3 +1,20 @@
+/*
+    Copyright (C) 2011 Adam Wardyński, Tomasz Śniatowski, Paweł Kędzia,
+    Adam Radziszewski, Bartosz Broda
+    Part of the WCCL project
+
+    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 LICENSE and COPYING files for more details.
+*/
+
 #include <libwccl/values/match.h>
 #include <libwccl/ops/match/actions/unmarkmatch.h>
 #include <libcorpus2/ann/annotatedsentence.h>
diff --git a/libwccl/ops/match/actions/unmarkmatch.h b/libwccl/ops/match/actions/unmarkmatch.h
index 9d074fb2277850dd2e198cd6305bf35273ae6d9f..6dc7b223ac58ff433ba331be6b4e5108cb87ad43 100644
--- a/libwccl/ops/match/actions/unmarkmatch.h
+++ b/libwccl/ops/match/actions/unmarkmatch.h
@@ -1,3 +1,20 @@
+/*
+    Copyright (C) 2011 Adam Wardyński, Tomasz Śniatowski, Paweł Kędzia,
+    Adam Radziszewski, Bartosz Broda
+    Part of the WCCL project
+
+    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 LICENSE and COPYING files for more details.
+*/
+
 #ifndef LIBWCCL_OPS_MATCH_ACTIONS_UNMARKMATCH_H
 #define LIBWCCL_OPS_MATCH_ACTIONS_UNMARKMATCH_H
 
diff --git a/libwccl/ops/match/applyoperator.cpp b/libwccl/ops/match/applyoperator.cpp
index 2d4ad494df18431b9db6ff8d1e0e8401e999e29a..01c0b93733f2ba4bbc66b99a3edf07800c644b32 100644
--- a/libwccl/ops/match/applyoperator.cpp
+++ b/libwccl/ops/match/applyoperator.cpp
@@ -1,3 +1,20 @@
+/*
+    Copyright (C) 2011 Adam Wardyński, Tomasz Śniatowski, Paweł Kędzia,
+    Adam Radziszewski, Bartosz Broda
+    Part of the WCCL project
+
+    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 LICENSE and COPYING files for more details.
+*/
+
 #include <libwccl/ops/match/applyoperator.h>
 #include <libwccl/values/match.h>
 #include <libwccl/ops/match/conditions/conjconditions.h>
diff --git a/libwccl/ops/match/applyoperator.h b/libwccl/ops/match/applyoperator.h
index 014ecc31296ec33707eba3315511331a9aaad62a..c1be4328253ede8bf36270ca4767bc6fb1de12fc 100644
--- a/libwccl/ops/match/applyoperator.h
+++ b/libwccl/ops/match/applyoperator.h
@@ -1,3 +1,20 @@
+/*
+    Copyright (C) 2011 Adam Wardyński, Tomasz Śniatowski, Paweł Kędzia,
+    Adam Radziszewski, Bartosz Broda
+    Part of the WCCL project
+
+    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 LICENSE and COPYING files for more details.
+*/
+
 #ifndef LIBWCCL_OPS_MATCH_APPLYOPERATOR_H
 #define LIBWCCL_OPS_MATCH_APPLYOPERATOR_H
 
diff --git a/libwccl/ops/match/conditions/conjconditions.cpp b/libwccl/ops/match/conditions/conjconditions.cpp
index c144716d738992072d92a5bd43b642176bd23d73..8392ffca47dab3d31ea64b8f11b705d9e484655d 100644
--- a/libwccl/ops/match/conditions/conjconditions.cpp
+++ b/libwccl/ops/match/conditions/conjconditions.cpp
@@ -1,3 +1,20 @@
+/*
+    Copyright (C) 2011 Adam Wardyński, Tomasz Śniatowski, Paweł Kędzia,
+    Adam Radziszewski, Bartosz Broda
+    Part of the WCCL project
+
+    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 LICENSE and COPYING files for more details.
+*/
+
 #include <libwccl/ops/match/conditions/conjconditions.h>
 #include <libwccl/values/matchvector.h>
 #include <libpwrutils/foreach.h>
diff --git a/libwccl/ops/match/conditions/conjconditions.h b/libwccl/ops/match/conditions/conjconditions.h
index ef5104b0ee9bbbf10a4d7f3f62e9a114143c5247..3d64b58255270fd931924f4629d2bd37eadc8bcc 100644
--- a/libwccl/ops/match/conditions/conjconditions.h
+++ b/libwccl/ops/match/conditions/conjconditions.h
@@ -1,3 +1,20 @@
+/*
+    Copyright (C) 2011 Adam Wardyński, Tomasz Śniatowski, Paweł Kędzia,
+    Adam Radziszewski, Bartosz Broda
+    Part of the WCCL project
+
+    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 LICENSE and COPYING files for more details.
+*/
+
 #ifndef LIBWCCL_OPS_MATCH_CONDITIONS_CONJCONDITIONS_H
 #define LIBWCCL_OPS_MATCH_CONDITIONS_CONJCONDITIONS_H
 
diff --git a/libwccl/ops/match/conditions/isannotatedas.cpp b/libwccl/ops/match/conditions/isannotatedas.cpp
index 433df1e78a1edfb2e8f9cfe5cfb825f1c9ee3afb..1bc49fccd1bbb8af95a4474fac3307565f86bbb4 100644
--- a/libwccl/ops/match/conditions/isannotatedas.cpp
+++ b/libwccl/ops/match/conditions/isannotatedas.cpp
@@ -1,3 +1,20 @@
+/*
+    Copyright (C) 2011 Adam Wardyński, Tomasz Śniatowski, Paweł Kędzia,
+    Adam Radziszewski, Bartosz Broda
+    Part of the WCCL project
+
+    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 LICENSE and COPYING files for more details.
+*/
+
 #include <libwccl/ops/match/conditions/isannotatedas.h>
 #include <sstream>
 
diff --git a/libwccl/ops/match/conditions/isannotatedas.h b/libwccl/ops/match/conditions/isannotatedas.h
index e40fbd0332b7834cb00138ed57a9979f66da557f..0f1669bad72cfd764593b8af14eb083db433b753 100644
--- a/libwccl/ops/match/conditions/isannotatedas.h
+++ b/libwccl/ops/match/conditions/isannotatedas.h
@@ -1,3 +1,20 @@
+/*
+    Copyright (C) 2011 Adam Wardyński, Tomasz Śniatowski, Paweł Kędzia,
+    Adam Radziszewski, Bartosz Broda
+    Part of the WCCL project
+
+    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 LICENSE and COPYING files for more details.
+*/
+
 #ifndef LIBWCCL_OPS_MATCH_CONDITIONS_ISANNOTATEDAS_H
 #define LIBWCCL_OPS_MATCH_CONDITIONS_ISANNOTATEDAS_H
 
diff --git a/libwccl/ops/match/conditions/longest.cpp b/libwccl/ops/match/conditions/longest.cpp
index e1a5405cc57d8a779fe728829d5156a9acf9f296..d0b6185fcd5edcef186057dfec9c76d235f2a9c7 100644
--- a/libwccl/ops/match/conditions/longest.cpp
+++ b/libwccl/ops/match/conditions/longest.cpp
@@ -1,3 +1,20 @@
+/*
+    Copyright (C) 2011 Adam Wardyński, Tomasz Śniatowski, Paweł Kędzia,
+    Adam Radziszewski, Bartosz Broda
+    Part of the WCCL project
+
+    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 LICENSE and COPYING files for more details.
+*/
+
 #include <libwccl/ops/match/conditions/longest.h>
 #include <libwccl/values/matchvector.h>
 #include <sstream>
diff --git a/libwccl/ops/match/conditions/longest.h b/libwccl/ops/match/conditions/longest.h
index 070738fd0bd1e0eccb4670ff16f5f84abf4d0bee..5bfc5cd164ae6960f9cc9f4c322179a74c8a58c0 100644
--- a/libwccl/ops/match/conditions/longest.h
+++ b/libwccl/ops/match/conditions/longest.h
@@ -1,3 +1,20 @@
+/*
+    Copyright (C) 2011 Adam Wardyński, Tomasz Śniatowski, Paweł Kędzia,
+    Adam Radziszewski, Bartosz Broda
+    Part of the WCCL project
+
+    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 LICENSE and COPYING files for more details.
+*/
+
 #ifndef LIBWCCL_OPS_MATCH_CONDITIONS_LONGEST_H
 #define LIBWCCL_OPS_MATCH_CONDITIONS_LONGEST_H
 
diff --git a/libwccl/ops/match/conditions/matchtext.cpp b/libwccl/ops/match/conditions/matchtext.cpp
index 6bad9979aed54c752eac26cde8dae9a5c551e641..4c97e4b03e9f6bc4bdcae41b9d6755f2253840e0 100644
--- a/libwccl/ops/match/conditions/matchtext.cpp
+++ b/libwccl/ops/match/conditions/matchtext.cpp
@@ -1,3 +1,20 @@
+/*
+    Copyright (C) 2011 Adam Wardyński, Tomasz Śniatowski, Paweł Kędzia,
+    Adam Radziszewski, Bartosz Broda
+    Part of the WCCL project
+
+    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 LICENSE and COPYING files for more details.
+*/
+
 #include <libwccl/ops/match/conditions/matchtext.h>
 #include <sstream>
 #include <libpwrutils/util.h>
diff --git a/libwccl/ops/match/conditions/matchtext.h b/libwccl/ops/match/conditions/matchtext.h
index 6a6805ae9af2c6c6cbaa6b3ba231328f930b9ce0..ef311c884b811f89efc83a95e7aa94dfb4f89f73 100644
--- a/libwccl/ops/match/conditions/matchtext.h
+++ b/libwccl/ops/match/conditions/matchtext.h
@@ -1,3 +1,20 @@
+/*
+    Copyright (C) 2011 Adam Wardyński, Tomasz Śniatowski, Paweł Kędzia,
+    Adam Radziszewski, Bartosz Broda
+    Part of the WCCL project
+
+    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 LICENSE and COPYING files for more details.
+*/
+
 #ifndef LIBWCCL_OPS_MATCH_CONDITIONS_MATCHTEXT_H
 #define LIBWCCL_OPS_MATCH_CONDITIONS_MATCHTEXT_H
 
diff --git a/libwccl/ops/match/conditions/oneof.cpp b/libwccl/ops/match/conditions/oneof.cpp
index 6871e84380650778c428efb5e30b12508b5fbc0a..0f5676682eea45a0cba440f96889f75792e356b4 100644
--- a/libwccl/ops/match/conditions/oneof.cpp
+++ b/libwccl/ops/match/conditions/oneof.cpp
@@ -1,3 +1,20 @@
+/*
+    Copyright (C) 2011 Adam Wardyński, Tomasz Śniatowski, Paweł Kędzia,
+    Adam Radziszewski, Bartosz Broda
+    Part of the WCCL project
+
+    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 LICENSE and COPYING files for more details.
+*/
+
 #include <libwccl/ops/match/conditions/oneof.h>
 #include <libwccl/values/matchvector.h>
 #include <sstream>
diff --git a/libwccl/ops/match/conditions/oneof.h b/libwccl/ops/match/conditions/oneof.h
index da6fc51d329038662e2426db4374e88c82b0e35c..46d8fdefe3b03bc43097621bb0635eccf04a9fa6 100644
--- a/libwccl/ops/match/conditions/oneof.h
+++ b/libwccl/ops/match/conditions/oneof.h
@@ -1,3 +1,20 @@
+/*
+    Copyright (C) 2011 Adam Wardyński, Tomasz Śniatowski, Paweł Kędzia,
+    Adam Radziszewski, Bartosz Broda
+    Part of the WCCL project
+
+    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 LICENSE and COPYING files for more details.
+*/
+
 #ifndef LIBWCCL_OPS_MATCH_CONDITIONS_ONEOF_H
 #define LIBWCCL_OPS_MATCH_CONDITIONS_ONEOF_H
 
diff --git a/libwccl/ops/match/conditions/optionalmatch.cpp b/libwccl/ops/match/conditions/optionalmatch.cpp
index 235fcc1595088512a13291c61f2fda1eb9ee1934..7f099d73a72c3b9f2c51fb8cf26309caca525af3 100644
--- a/libwccl/ops/match/conditions/optionalmatch.cpp
+++ b/libwccl/ops/match/conditions/optionalmatch.cpp
@@ -1,3 +1,20 @@
+/*
+    Copyright (C) 2011 Adam Wardyński, Tomasz Śniatowski, Paweł Kędzia,
+    Adam Radziszewski, Bartosz Broda
+    Part of the WCCL project
+
+    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 LICENSE and COPYING files for more details.
+*/
+
 #include <libwccl/ops/match/conditions/optionalmatch.h>
 #include <libwccl/values/matchvector.h>
 #include <sstream>
diff --git a/libwccl/ops/match/conditions/optionalmatch.h b/libwccl/ops/match/conditions/optionalmatch.h
index beba430a947b4f803c135a6550209ba7da972846..fda42665a294d437974b341a0c05deba3cadffdc 100644
--- a/libwccl/ops/match/conditions/optionalmatch.h
+++ b/libwccl/ops/match/conditions/optionalmatch.h
@@ -1,3 +1,20 @@
+/*
+    Copyright (C) 2011 Adam Wardyński, Tomasz Śniatowski, Paweł Kędzia,
+    Adam Radziszewski, Bartosz Broda
+    Part of the WCCL project
+
+    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 LICENSE and COPYING files for more details.
+*/
+
 #ifndef LIBWCCL_OPS_MATCH_CONDITIONS_OPTIONALMATCH_H
 #define LIBWCCL_OPS_MATCH_CONDITIONS_OPTIONALMATCH_H
 
diff --git a/libwccl/ops/match/conditions/repeatedmatch.cpp b/libwccl/ops/match/conditions/repeatedmatch.cpp
index f5d71cb2db59a3b5a8ff1fd6601bc8a4d3382256..043732b8bffcbba022105e2d6a128b62bcc8193d 100644
--- a/libwccl/ops/match/conditions/repeatedmatch.cpp
+++ b/libwccl/ops/match/conditions/repeatedmatch.cpp
@@ -1,3 +1,20 @@
+/*
+    Copyright (C) 2011 Adam Wardyński, Tomasz Śniatowski, Paweł Kędzia,
+    Adam Radziszewski, Bartosz Broda
+    Part of the WCCL project
+
+    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 LICENSE and COPYING files for more details.
+*/
+
 #include <libwccl/ops/match/conditions/repeatedmatch.h>
 #include <libwccl/values/matchvector.h>
 #include <sstream>
diff --git a/libwccl/ops/match/conditions/repeatedmatch.h b/libwccl/ops/match/conditions/repeatedmatch.h
index 618945d38e04ec6a2acd8d7497f65be30027475a..99a5ed42b423916be96cf2aec15f89827c1efad9 100644
--- a/libwccl/ops/match/conditions/repeatedmatch.h
+++ b/libwccl/ops/match/conditions/repeatedmatch.h
@@ -1,3 +1,20 @@
+/*
+    Copyright (C) 2011 Adam Wardyński, Tomasz Śniatowski, Paweł Kędzia,
+    Adam Radziszewski, Bartosz Broda
+    Part of the WCCL project
+
+    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 LICENSE and COPYING files for more details.
+*/
+
 #ifndef LIBWCCL_OPS_MATCH_CONDITIONS_REPEATEDMATCH_H
 #define LIBWCCL_OPS_MATCH_CONDITIONS_REPEATEDMATCH_H
 
diff --git a/libwccl/ops/match/conditions/tokencondition.cpp b/libwccl/ops/match/conditions/tokencondition.cpp
index 06efcdf1c6047d2e770395317f97cf0075341ddd..6dedf2e8281b45cfd0054271eeea62a23121ac25 100644
--- a/libwccl/ops/match/conditions/tokencondition.cpp
+++ b/libwccl/ops/match/conditions/tokencondition.cpp
@@ -1,3 +1,20 @@
+/*
+    Copyright (C) 2011 Adam Wardyński, Tomasz Śniatowski, Paweł Kędzia,
+    Adam Radziszewski, Bartosz Broda
+    Part of the WCCL project
+
+    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 LICENSE and COPYING files for more details.
+*/
+
 #include <libwccl/ops/match/conditions/tokencondition.h>
 #include <libwccl/values/tokenmatch.h>
 
diff --git a/libwccl/ops/match/conditions/tokencondition.h b/libwccl/ops/match/conditions/tokencondition.h
index 53d04324310a35dae53f039aa5db987f3795e2fc..27224dc21549530bfa51912e032d5e700ac7ffb7 100644
--- a/libwccl/ops/match/conditions/tokencondition.h
+++ b/libwccl/ops/match/conditions/tokencondition.h
@@ -1,3 +1,20 @@
+/*
+    Copyright (C) 2011 Adam Wardyński, Tomasz Śniatowski, Paweł Kędzia,
+    Adam Radziszewski, Bartosz Broda
+    Part of the WCCL project
+
+    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 LICENSE and COPYING files for more details.
+*/
+
 #ifndef LIBWCCL_OPS_MATCH_CONDITIONS_TOKENCODITION_H
 #define LIBWCCL_OPS_MATCH_CONDITIONS_TOKENCODITION_H
 
diff --git a/libwccl/ops/match/matchaction.h b/libwccl/ops/match/matchaction.h
index 527747ea787a06ab2b09ace9694568a8cf07e82d..79ec698482de958c39c75df442178bc546d14a44 100644
--- a/libwccl/ops/match/matchaction.h
+++ b/libwccl/ops/match/matchaction.h
@@ -1,3 +1,20 @@
+/*
+    Copyright (C) 2011 Adam Wardyński, Tomasz Śniatowski, Paweł Kędzia,
+    Adam Radziszewski, Bartosz Broda
+    Part of the WCCL project
+
+    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 LICENSE and COPYING files for more details.
+*/
+
 #ifndef LIBWCCL_OPS_MATCH_MATCHACTION_H
 #define LIBWCCL_OPS_MATCH_MATCHACTION_H
 
diff --git a/libwccl/ops/match/matchcondition.h b/libwccl/ops/match/matchcondition.h
index 12dde83b7f2f6aeee8ab8d1fa6915eaaf785ce4b..5a7a0010ccc59c7f539d377f0c45f952fe157292 100644
--- a/libwccl/ops/match/matchcondition.h
+++ b/libwccl/ops/match/matchcondition.h
@@ -1,3 +1,20 @@
+/*
+    Copyright (C) 2011 Adam Wardyński, Tomasz Śniatowski, Paweł Kędzia,
+    Adam Radziszewski, Bartosz Broda
+    Part of the WCCL project
+
+    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 LICENSE and COPYING files for more details.
+*/
+
 #ifndef LIBWCCL_OPS_MATCH_MATCHCONDITION_H
 #define LIBWCCL_OPS_MATCH_MATCHCONDITION_H
 
diff --git a/libwccl/ops/match/matchresult.h b/libwccl/ops/match/matchresult.h
index c4e2a05f0b24a0bf6bb4eaf307f3ab3c956f5fcc..8137ca9bfdc719c4e7c5a821f89b28b2ab1288dc 100644
--- a/libwccl/ops/match/matchresult.h
+++ b/libwccl/ops/match/matchresult.h
@@ -1,3 +1,20 @@
+/*
+    Copyright (C) 2011 Adam Wardyński, Tomasz Śniatowski, Paweł Kędzia,
+    Adam Radziszewski, Bartosz Broda
+    Part of the WCCL project
+
+    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 LICENSE and COPYING files for more details.
+*/
+
 #ifndef LIBWCCL_OPS_MATCH_MATCHRESULT_H
 #define LIBWCCL_OPS_MATCH_MATCHRESULT_H
 
diff --git a/libwccl/ops/matchrule.cpp b/libwccl/ops/matchrule.cpp
index fc89922476f7e95ccc71e7a4b19455992b641d48..52bb4d591dc152966ec8bd8379053d88f716ed32 100644
--- a/libwccl/ops/matchrule.cpp
+++ b/libwccl/ops/matchrule.cpp
@@ -1,3 +1,20 @@
+/*
+    Copyright (C) 2011 Adam Wardyński, Tomasz Śniatowski, Paweł Kędzia,
+    Adam Radziszewski, Bartosz Broda
+    Part of the WCCL project
+
+    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 LICENSE and COPYING files for more details.
+*/
+
 #include <libwccl/sentencecontext.h>
 #include <libwccl/ops/match/applyoperator.h>
 #include <libwccl/ops/matchrule.h>
diff --git a/libwccl/ops/matchrule.h b/libwccl/ops/matchrule.h
index f029d67bb3efce76a8049f0593fb752ddfbf1592..019f8d83323cb3aac69a009fd1ef399f6adf8655 100644
--- a/libwccl/ops/matchrule.h
+++ b/libwccl/ops/matchrule.h
@@ -1,3 +1,20 @@
+/*
+    Copyright (C) 2011 Adam Wardyński, Tomasz Śniatowski, Paweł Kędzia,
+    Adam Radziszewski, Bartosz Broda
+    Part of the WCCL project
+
+    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 LICENSE and COPYING files for more details.
+*/
+
 #ifndef LIBWCCL_OPS_MATCHRULE_H
 #define LIBWCCL_OPS_MATCHRULE_H
 
diff --git a/libwccl/ops/matchrulesequence.cpp b/libwccl/ops/matchrulesequence.cpp
index 45f310150515f6068df5818d5ce53eece7ae196e..ec9eed2bf82df1dd3df60491812a64d752893027 100644
--- a/libwccl/ops/matchrulesequence.cpp
+++ b/libwccl/ops/matchrulesequence.cpp
@@ -1,10 +1,30 @@
+/*
+    Copyright (C) 2011 Adam Wardyński, Tomasz Śniatowski, Paweł Kędzia,
+    Adam Radziszewski, Bartosz Broda
+    Part of the WCCL project
+
+    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 LICENSE and COPYING files for more details.
+*/
+
 #include <libwccl/ops/matchrulesequence.h>
 #include <libpwrutils/foreach.h>
 
+#include <boost/shared_ptr.hpp>
+
 namespace Wccl {
 namespace Matching {
 
-void MatchRuleSequence::apply_all(const boost::shared_ptr<Corpus2::AnnotatedSentence>& sentence)
+void MatchRuleSequence::apply_all(
+		const boost::shared_ptr<Corpus2::AnnotatedSentence>& sentence)
 {
 	if(!sentence || sentence->empty()) {
 		throw InvalidArgument(
@@ -16,6 +36,19 @@ void MatchRuleSequence::apply_all(const boost::shared_ptr<Corpus2::AnnotatedSent
 	}
 }
 
+void MatchRuleSequence::apply_all_sentence_wrapper(
+		const boost::shared_ptr<Corpus2::Sentence>& sentence)
+{
+	boost::shared_ptr<Corpus2::AnnotatedSentence> as;
+	as = boost::dynamic_pointer_cast<Corpus2::AnnotatedSentence>(sentence);
+	if (!as) {
+		throw InvalidArgument(
+				"sentence",
+				"Did not get an AnnotatedSentence from reader, 'ann' option broken?");
+	}
+	apply_all(as);
+}
+
 std::string MatchRuleSequence::to_string(const Corpus2::Tagset& tagset) const
 {
 	std::ostringstream os;
diff --git a/libwccl/ops/matchrulesequence.h b/libwccl/ops/matchrulesequence.h
index 1b94aa0cd8c66cc9f3727019a0e13371f50f8171..28956df82283b60988b9400b6729f607af7b019b 100644
--- a/libwccl/ops/matchrulesequence.h
+++ b/libwccl/ops/matchrulesequence.h
@@ -1,3 +1,20 @@
+/*
+    Copyright (C) 2011 Adam Wardyński, Tomasz Śniatowski, Paweł Kędzia,
+    Adam Radziszewski, Bartosz Broda
+    Part of the WCCL project
+
+    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 LICENSE and COPYING files for more details.
+*/
+
 #ifndef LIBWCCL_OPS_MATCHRULESEQUENCE_H
 #define LIBWCCL_OPS_MATCHRULESEQUENCE_H
 
@@ -54,6 +71,14 @@ public:
 	 */
 	void apply_all(const boost::shared_ptr<Corpus2::AnnotatedSentence>& sentence);
 
+	/**
+	 * A convenience wrapper that pretends the input is a standard
+	 * Corpus::Sentence object and casts it internally as an AnnotatedSentence.
+	 * @see \link apply_all \endlink - the same routine without wrapping.
+	 */
+	void apply_all_sentence_wrapper(
+			const boost::shared_ptr<Corpus2::Sentence>& sentence);
+
 	std::string to_string(const Corpus2::Tagset& tagset) const;
 protected:
 	std::ostream& write_to(std::ostream& os) const;
diff --git a/libwccl/ops/operator.h b/libwccl/ops/operator.h
index 4ba168726146b776dd784aadc18c1e688515454d..9531d606ff6ea5e120349747a0ef8e83dc77aaf2 100644
--- a/libwccl/ops/operator.h
+++ b/libwccl/ops/operator.h
@@ -1,3 +1,20 @@
+/*
+    Copyright (C) 2011 Adam Wardyński, Tomasz Śniatowski, Paweł Kędzia,
+    Adam Radziszewski, Bartosz Broda
+    Part of the WCCL project
+
+    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 LICENSE and COPYING files for more details.
+*/
+
 #ifndef LIBWCCL_OPS_OPERATOR_H
 #define LIBWCCL_OPS_OPERATOR_H
 
diff --git a/libwccl/ops/opsequence.cpp b/libwccl/ops/opsequence.cpp
index cf7f316d3aa19d3b357992830b0591c4236616b7..63bafaf30e23c57c63a4a94cf43ab8eecf0898eb 100644
--- a/libwccl/ops/opsequence.cpp
+++ b/libwccl/ops/opsequence.cpp
@@ -1,3 +1,20 @@
+/*
+    Copyright (C) 2011 Adam Wardyński, Tomasz Śniatowski, Paweł Kędzia,
+    Adam Radziszewski, Bartosz Broda
+    Part of the WCCL project
+
+    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 LICENSE and COPYING files for more details.
+*/
+
 #include <libwccl/ops/opsequence.h>
 
 namespace Wccl {
diff --git a/libwccl/ops/opsequence.h b/libwccl/ops/opsequence.h
index 54eb9e7ad4c95a9781339d1a3cb5292e61534eb6..2a1bf4ea487caa74125c16bac0cd9302b641a2d3 100644
--- a/libwccl/ops/opsequence.h
+++ b/libwccl/ops/opsequence.h
@@ -1,3 +1,20 @@
+/*
+    Copyright (C) 2011 Adam Wardyński, Tomasz Śniatowski, Paweł Kędzia,
+    Adam Radziszewski, Bartosz Broda
+    Part of the WCCL project
+
+    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 LICENSE and COPYING files for more details.
+*/
+
 #ifndef LIBWCCL_OPS_OPSEQUENCE_H
 #define LIBWCCL_OPS_OPSEQUENCE_H
 
diff --git a/libwccl/ops/parsedexpression.h b/libwccl/ops/parsedexpression.h
index 1982c8bb97b9c9ba07153f7a2f36f8dcde5b1cea..c8daf20d74c3cbaceb14b8d1325313dd8bfde06c 100644
--- a/libwccl/ops/parsedexpression.h
+++ b/libwccl/ops/parsedexpression.h
@@ -1,3 +1,20 @@
+/*
+    Copyright (C) 2011 Adam Wardyński, Tomasz Śniatowski, Paweł Kędzia,
+    Adam Radziszewski, Bartosz Broda
+    Part of the WCCL project
+
+    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 LICENSE and COPYING files for more details.
+*/
+
 #ifndef LIBWCCL_OPS_PARSEDEXPRESSION_H
 #define LIBWCCL_OPS_PARSEDEXPRESSION_H
 
diff --git a/libwccl/ops/tagaction.cpp b/libwccl/ops/tagaction.cpp
index 99a7eed05d11f4cbbad5def0f296a0722859a933..1601b4fb667ea961d2fb14d1bbc41f5c2b411a51 100644
--- a/libwccl/ops/tagaction.cpp
+++ b/libwccl/ops/tagaction.cpp
@@ -1,3 +1,20 @@
+/*
+    Copyright (C) 2011 Adam Wardyński, Tomasz Śniatowski, Paweł Kędzia,
+    Adam Radziszewski, Bartosz Broda
+    Part of the WCCL project
+
+    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 LICENSE and COPYING files for more details.
+*/
+
 #include <libwccl/ops/tagaction.h>
 #include <libwccl/ops/functions/constant.h>
 namespace Wccl {
diff --git a/libwccl/ops/tagaction.h b/libwccl/ops/tagaction.h
index f30428c3a5885a801a8a7f754bab58aa3e80a31a..aa2202ea681b427f743eb8f113e57ac5d51585e5 100644
--- a/libwccl/ops/tagaction.h
+++ b/libwccl/ops/tagaction.h
@@ -1,3 +1,20 @@
+/*
+    Copyright (C) 2011 Adam Wardyński, Tomasz Śniatowski, Paweł Kędzia,
+    Adam Radziszewski, Bartosz Broda
+    Part of the WCCL project
+
+    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 LICENSE and COPYING files for more details.
+*/
+
 #ifndef LIBWCCL_OPS_TAGACTION_H
 #define LIBWCCL_OPS_TAGACTION_H
 
diff --git a/libwccl/ops/tagactions/delete.cpp b/libwccl/ops/tagactions/delete.cpp
index 05cb5b6be1a47807a739a3abcfc3a0fcf30bcfa8..4bdee2ed3b9e968db0133ae946cabfd98488721a 100644
--- a/libwccl/ops/tagactions/delete.cpp
+++ b/libwccl/ops/tagactions/delete.cpp
@@ -1,3 +1,20 @@
+/*
+    Copyright (C) 2011 Adam Wardyński, Tomasz Śniatowski, Paweł Kędzia,
+    Adam Radziszewski, Bartosz Broda
+    Part of the WCCL project
+
+    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 LICENSE and COPYING files for more details.
+*/
+
 #include <libwccl/ops/tagactions/delete.h>
 #include <libpwrutils/foreach.h>
 #include <sstream>
diff --git a/libwccl/ops/tagactions/delete.h b/libwccl/ops/tagactions/delete.h
index 3403138479aa88cd2692216d31f405ff850d24e4..c38654769eb62242e4ba1990fa4eef41328daf18 100644
--- a/libwccl/ops/tagactions/delete.h
+++ b/libwccl/ops/tagactions/delete.h
@@ -1,3 +1,20 @@
+/*
+    Copyright (C) 2011 Adam Wardyński, Tomasz Śniatowski, Paweł Kędzia,
+    Adam Radziszewski, Bartosz Broda
+    Part of the WCCL project
+
+    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 LICENSE and COPYING files for more details.
+*/
+
 #ifndef LIBWCCL_OPS_TAGACTIONS_DELETE_H
 #define LIBWCCL_OPS_TAGACTIONS_DELETE_H
 
diff --git a/libwccl/ops/tagactions/mark.cpp b/libwccl/ops/tagactions/mark.cpp
index 42eea2d0e2ee44e2a019f8fc5c2fdf07ec901faf..ccbd8a16d88383a041bc04e8d309dfa0cb17606a 100644
--- a/libwccl/ops/tagactions/mark.cpp
+++ b/libwccl/ops/tagactions/mark.cpp
@@ -1,3 +1,20 @@
+/*
+    Copyright (C) 2011 Adam Wardyński, Tomasz Śniatowski, Paweł Kędzia,
+    Adam Radziszewski, Bartosz Broda
+    Part of the WCCL project
+
+    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 LICENSE and COPYING files for more details.
+*/
+
 #include <libwccl/ops/tagactions/mark.h>
 #include <libpwrutils/foreach.h>
 #include <libcorpus2/ann/annotatedsentence.h>
diff --git a/libwccl/ops/tagactions/mark.h b/libwccl/ops/tagactions/mark.h
index de0e471aeb47299e4cc0bdbad3f3f89b50ca4e8a..05ba740bb4d1bf84aee58cbbde42d4b636376830 100644
--- a/libwccl/ops/tagactions/mark.h
+++ b/libwccl/ops/tagactions/mark.h
@@ -1,3 +1,20 @@
+/*
+    Copyright (C) 2011 Adam Wardyński, Tomasz Śniatowski, Paweł Kędzia,
+    Adam Radziszewski, Bartosz Broda
+    Part of the WCCL project
+
+    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 LICENSE and COPYING files for more details.
+*/
+
 #ifndef LIBWCCL_OPS_TAGACTIONS_MARK_H
 #define LIBWCCL_OPS_TAGACTIONS_MARK_H
 
diff --git a/libwccl/ops/tagactions/relabel.cpp b/libwccl/ops/tagactions/relabel.cpp
index aa2643973ae20fe9e7735a65d74ead8e50f48053..5f2f02da58207d2c80525a8a76da7c48a1c99ce8 100644
--- a/libwccl/ops/tagactions/relabel.cpp
+++ b/libwccl/ops/tagactions/relabel.cpp
@@ -1,3 +1,20 @@
+/*
+    Copyright (C) 2011 Adam Wardyński, Tomasz Śniatowski, Paweł Kędzia,
+    Adam Radziszewski, Bartosz Broda
+    Part of the WCCL project
+
+    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 LICENSE and COPYING files for more details.
+*/
+
 #include <libwccl/ops/tagactions/relabel.h>
 #include <libpwrutils/foreach.h>
 #include <sstream>
diff --git a/libwccl/ops/tagactions/relabel.h b/libwccl/ops/tagactions/relabel.h
index f1b10ede2ebb33fde6d445137d55896d18cf7b6e..6d420ec553871c4b4ca988c848798b2254d50abc 100644
--- a/libwccl/ops/tagactions/relabel.h
+++ b/libwccl/ops/tagactions/relabel.h
@@ -1,3 +1,20 @@
+/*
+    Copyright (C) 2011 Adam Wardyński, Tomasz Śniatowski, Paweł Kędzia,
+    Adam Radziszewski, Bartosz Broda
+    Part of the WCCL project
+
+    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 LICENSE and COPYING files for more details.
+*/
+
 #ifndef LIBWCCL_OPS_TAGACTIONS_RELABEL_H
 #define LIBWCCL_OPS_TAGACTIONS_RELABEL_H
 
diff --git a/libwccl/ops/tagactions/select.cpp b/libwccl/ops/tagactions/select.cpp
index 3205800c2e006a4103bf2edecec99187757d2d66..10a3c0010827bbab10db52929edf808d715d63f5 100644
--- a/libwccl/ops/tagactions/select.cpp
+++ b/libwccl/ops/tagactions/select.cpp
@@ -1,3 +1,20 @@
+/*
+    Copyright (C) 2011 Adam Wardyński, Tomasz Śniatowski, Paweł Kędzia,
+    Adam Radziszewski, Bartosz Broda
+    Part of the WCCL project
+
+    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 LICENSE and COPYING files for more details.
+*/
+
 #include <libwccl/ops/tagactions/select.h>
 #include <libpwrutils/foreach.h>
 #include <sstream>
diff --git a/libwccl/ops/tagactions/select.h b/libwccl/ops/tagactions/select.h
index bd46714f6985aa50cea04d1c8e70f002492beaa4..83960728bd0b2d3f696623432bbfd1342f25543a 100644
--- a/libwccl/ops/tagactions/select.h
+++ b/libwccl/ops/tagactions/select.h
@@ -1,3 +1,20 @@
+/*
+    Copyright (C) 2011 Adam Wardyński, Tomasz Śniatowski, Paweł Kędzia,
+    Adam Radziszewski, Bartosz Broda
+    Part of the WCCL project
+
+    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 LICENSE and COPYING files for more details.
+*/
+
 #ifndef LIBWCCL_OPS_TAGACTIONS_SELECT_H
 #define LIBWCCL_OPS_TAGACTIONS_SELECT_H
 
diff --git a/libwccl/ops/tagactions/unify.cpp b/libwccl/ops/tagactions/unify.cpp
index 2c1e548a035dc4c5cd060e18abd64e9b2edae492..c2e89035f0bf2c7b009520b41324a89bcec30222 100644
--- a/libwccl/ops/tagactions/unify.cpp
+++ b/libwccl/ops/tagactions/unify.cpp
@@ -1,3 +1,20 @@
+/*
+    Copyright (C) 2011 Adam Wardyński, Tomasz Śniatowski, Paweł Kędzia,
+    Adam Radziszewski, Bartosz Broda
+    Part of the WCCL project
+
+    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 LICENSE and COPYING files for more details.
+*/
+
 #include <libwccl/ops/tagactions/unify.h>
 #include <libpwrutils/foreach.h>
 #include <sstream>
diff --git a/libwccl/ops/tagactions/unify.h b/libwccl/ops/tagactions/unify.h
index 17eb81b0ea0ffa376184003fb698f0f82844ffff..7b274873430462d44b84176645ad8abffa630aba 100644
--- a/libwccl/ops/tagactions/unify.h
+++ b/libwccl/ops/tagactions/unify.h
@@ -1,3 +1,20 @@
+/*
+    Copyright (C) 2011 Adam Wardyński, Tomasz Śniatowski, Paweł Kędzia,
+    Adam Radziszewski, Bartosz Broda
+    Part of the WCCL project
+
+    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 LICENSE and COPYING files for more details.
+*/
+
 #ifndef LIBWCCL_OPS_TAGACTIONS_UNIFY_H
 #define LIBWCCL_OPS_TAGACTIONS_UNIFY_H
 
diff --git a/libwccl/ops/tagactions/unmark.cpp b/libwccl/ops/tagactions/unmark.cpp
index 5de0fa6389ba3bedd4ac796965b8acce0cb3e796..3858bc86276dad8db6cab7c0ee88e6acfc59806b 100644
--- a/libwccl/ops/tagactions/unmark.cpp
+++ b/libwccl/ops/tagactions/unmark.cpp
@@ -1,3 +1,20 @@
+/*
+    Copyright (C) 2011 Adam Wardyński, Tomasz Śniatowski, Paweł Kędzia,
+    Adam Radziszewski, Bartosz Broda
+    Part of the WCCL project
+
+    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 LICENSE and COPYING files for more details.
+*/
+
 #include <libwccl/ops/tagactions/unmark.h>
 #include <libpwrutils/foreach.h>
 #include <libcorpus2/ann/annotatedsentence.h>
diff --git a/libwccl/ops/tagactions/unmark.h b/libwccl/ops/tagactions/unmark.h
index 21991e6c2017ed2ba617af98ed0449fb6bff476f..a1d9b8be6cca1590d73bd6919148f5aad344b39d 100644
--- a/libwccl/ops/tagactions/unmark.h
+++ b/libwccl/ops/tagactions/unmark.h
@@ -1,3 +1,20 @@
+/*
+    Copyright (C) 2011 Adam Wardyński, Tomasz Śniatowski, Paweł Kędzia,
+    Adam Radziszewski, Bartosz Broda
+    Part of the WCCL project
+
+    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 LICENSE and COPYING files for more details.
+*/
+
 #ifndef LIBWCCL_OPS_TAGACTIONS_UNMARK_H
 #define LIBWCCL_OPS_TAGACTIONS_UNMARK_H
 
diff --git a/libwccl/ops/tagrule.cpp b/libwccl/ops/tagrule.cpp
index 2fc123f268cde8735c03c0c11aaa4fa5593a079a..38b2970717a2b443317f2ce1495b2f13e08913c6 100644
--- a/libwccl/ops/tagrule.cpp
+++ b/libwccl/ops/tagrule.cpp
@@ -1,3 +1,20 @@
+/*
+    Copyright (C) 2011 Adam Wardyński, Tomasz Śniatowski, Paweł Kędzia,
+    Adam Radziszewski, Bartosz Broda
+    Part of the WCCL project
+
+    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 LICENSE and COPYING files for more details.
+*/
+
 #include <libwccl/ops/tagrule.h>
 #include <sstream>
 
diff --git a/libwccl/ops/tagrule.h b/libwccl/ops/tagrule.h
index daee75052d59612360060552ef352acbbb6d84d3..e9f2a366fda6f2db1bbf85411f7ff93e253a0ded 100644
--- a/libwccl/ops/tagrule.h
+++ b/libwccl/ops/tagrule.h
@@ -1,3 +1,20 @@
+/*
+    Copyright (C) 2011 Adam Wardyński, Tomasz Śniatowski, Paweł Kędzia,
+    Adam Radziszewski, Bartosz Broda
+    Part of the WCCL project
+
+    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 LICENSE and COPYING files for more details.
+*/
+
 #ifndef LIBWCCL_OPS_TAGRULE_H
 #define LIBWCCL_OPS_TAGRULE_H
 
diff --git a/libwccl/ops/tagrulesequence.cpp b/libwccl/ops/tagrulesequence.cpp
index 353a37e821b45c4d635bd04481a622424f4f9a13..981348a8de6fbb2b805b792fe30651a729a610e2 100644
--- a/libwccl/ops/tagrulesequence.cpp
+++ b/libwccl/ops/tagrulesequence.cpp
@@ -1,3 +1,20 @@
+/*
+    Copyright (C) 2011 Adam Wardyński, Tomasz Śniatowski, Paweł Kędzia,
+    Adam Radziszewski, Bartosz Broda
+    Part of the WCCL project
+
+    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 LICENSE and COPYING files for more details.
+*/
+
 #include <libwccl/ops/tagrulesequence.h>
 #include <libpwrutils/foreach.h>
 
diff --git a/libwccl/ops/tagrulesequence.h b/libwccl/ops/tagrulesequence.h
index 34d5534ebac76610f97b20195e969fb39e19f7c7..931aa0bcdc570542f4b37d1ff4e6b2c9e1f78c02 100644
--- a/libwccl/ops/tagrulesequence.h
+++ b/libwccl/ops/tagrulesequence.h
@@ -1,3 +1,20 @@
+/*
+    Copyright (C) 2011 Adam Wardyński, Tomasz Śniatowski, Paweł Kędzia,
+    Adam Radziszewski, Bartosz Broda
+    Part of the WCCL project
+
+    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 LICENSE and COPYING files for more details.
+*/
+
 #ifndef LIBWCCL_OPS_TAGRULESEQUENCE_H
 #define LIBWCCL_OPS_TAGRULESEQUENCE_H
 
diff --git a/libwccl/parser/ANTLRParserResult.h b/libwccl/parser/ANTLRParserResult.h
index 30fe9643b5c40c9a85bfb7f1231afed6e09d8d05..c08fdbd956d4501fedbf392c55c143eaf21e3097 100644
--- a/libwccl/parser/ANTLRParserResult.h
+++ b/libwccl/parser/ANTLRParserResult.h
@@ -1,3 +1,20 @@
+/*
+    Copyright (C) 2011 Adam Wardyński, Tomasz Śniatowski, Paweł Kędzia,
+    Adam Radziszewski, Bartosz Broda
+    Part of the WCCL project
+
+    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 LICENSE and COPYING files for more details.
+*/
+
 #ifndef LIBWCCL_ANTLRPARSERRESULT_H
 #define LIBWCCL_ANTLRPARSERRESULT_H
 
diff --git a/libwccl/parser/Parser.cpp b/libwccl/parser/Parser.cpp
index 75b694b94057a6956f5df95d3f423fef17fa0041..8e58d080a9d5181d0674ba79d4e82b865c6ae374 100644
--- a/libwccl/parser/Parser.cpp
+++ b/libwccl/parser/Parser.cpp
@@ -1,3 +1,20 @@
+/*
+    Copyright (C) 2011 Adam Wardyński, Tomasz Śniatowski, Paweł Kędzia,
+    Adam Radziszewski, Bartosz Broda
+    Part of the WCCL project
+
+    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 LICENSE and COPYING files for more details.
+*/
+
 #include <libwccl/parser/Parser.h>
 #include "ANTLRLexer.hpp"
 #include "ANTLRParser.hpp"
diff --git a/libwccl/parser/Parser.h b/libwccl/parser/Parser.h
index bdc0a5e5417f739206ec62771869390e9caf2e5f..ecf610ab4bcf43e5f0459a51d1ba9bd0b1080d23 100644
--- a/libwccl/parser/Parser.h
+++ b/libwccl/parser/Parser.h
@@ -1,3 +1,20 @@
+/*
+    Copyright (C) 2011 Adam Wardyński, Tomasz Śniatowski, Paweł Kędzia,
+    Adam Radziszewski, Bartosz Broda
+    Part of the WCCL project
+
+    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 LICENSE and COPYING files for more details.
+*/
+
 #ifndef LIBWCCL_PARSER_PARSER_H
 #define LIBWCCL_PARSER_PARSER_H
 
diff --git a/libwccl/parser/ParserException.cpp b/libwccl/parser/ParserException.cpp
index 3d5999cf28063c3c856a0ae1d45b1a6796a15977..2919482b76cdec38ed4ebd033eaf9af5ada1165b 100644
--- a/libwccl/parser/ParserException.cpp
+++ b/libwccl/parser/ParserException.cpp
@@ -1,3 +1,20 @@
+/*
+    Copyright (C) 2011 Adam Wardyński, Tomasz Śniatowski, Paweł Kędzia,
+    Adam Radziszewski, Bartosz Broda
+    Part of the WCCL project
+
+    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 LICENSE and COPYING files for more details.
+*/
+
 #include <libwccl/parser/ParserException.h>
 
 ParserException::ParserException(std::string msg) : WcclError(msg)
diff --git a/libwccl/parser/ParserException.h b/libwccl/parser/ParserException.h
index d5d0ca29116f1e4a73f8ed0f467e7c2b9461bcca..1d5aad9cf33b767c0692ca801d9e7309c77ae3a6 100644
--- a/libwccl/parser/ParserException.h
+++ b/libwccl/parser/ParserException.h
@@ -1,3 +1,20 @@
+/*
+    Copyright (C) 2011 Adam Wardyński, Tomasz Śniatowski, Paweł Kędzia,
+    Adam Radziszewski, Bartosz Broda
+    Part of the WCCL project
+
+    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 LICENSE and COPYING files for more details.
+*/
+
 #ifndef LIBWCCL_PARSER_PARSEREXCEPTION_H
 #define LIBWCCL_PARSER_PARSEREXCEPTION_H
 
diff --git a/libwccl/parser/grammar.g b/libwccl/parser/grammar.g
index bde2a6227c20ee9e78ef984287c8878378ba4e11..b78762979cb8ae21bbdcf639ffc5e4b76baea4b1 100644
--- a/libwccl/parser/grammar.g
+++ b/libwccl/parser/grammar.g
@@ -69,6 +69,7 @@ header {
 	#include <libwccl/ops/functions/bool/iterations/atleast.h>
 	#include <libwccl/ops/functions/bool/iterations/leftlook.h>
 	#include <libwccl/ops/functions/bool/iterations/rightlook.h>
+	#include <libwccl/ops/functions/bool/iterations/skip.h>
 	
 	// Rules, actions
 	#include <libwccl/ops/tagrule.h>
@@ -97,6 +98,7 @@ header {
 	#include <libwccl/ops/match/conditions/longest.h>
 	#include <libwccl/ops/match/actions/markmatch.h>
 	#include <libwccl/ops/match/actions/unmarkmatch.h>
+	#include <libwccl/ops/match/actions/overwritematch.h>
 	#include <libwccl/ops/functions/match/submatch.h>
 
 	// Wccl whole file syntax
@@ -859,7 +861,7 @@ symset_range
 			p2  = position_operator [scope] 
 		RPAREN {
 			if (tag_class) {
-				ret.reset(new GetSymbolsInRange(Corpus2::Tag(-1), p1, p2));
+				ret.reset(new GetSymbolsInRange(Corpus2::Tag::all_pos_mask, p1, p2));
 			}
 			else {
 		 		ret.reset(new GetSymbolsInRange(tset->get_value(), p1, p2));
@@ -1682,6 +1684,7 @@ bool_iteration
 	returns [boost::shared_ptr<Function<Bool> > ret]
 {
 	int min_match = 0;
+	int offset = 0;
 	boost::shared_ptr<Function<Bool> > expr;
 	boost::shared_ptr<Function<Position> > lpos, rpos;
 	boost::shared_ptr<VariableAccessor<Position> > pacc;
@@ -1720,6 +1723,14 @@ bool_iteration
 		RPAREN {
 			ret.reset(new RightLook(lpos, rpos, *pacc, expr));
 		}
+	| "skip" LPAREN
+			lpos = position_operator [scope] COMMA 
+			pacc = position_variable_acc [scope.variables()]     COMMA
+			expr = bool_operator     [scope] COMMA
+			offset = number
+		RPAREN {
+			ret.reset(new Skip(lpos, *pacc, expr, offset));
+		}
 ;
 
 // ----------------------------------------------------------------------------
@@ -2686,6 +2697,7 @@ match_action
 	returns [boost::shared_ptr<Matching::MatchAction> m_act]
 	: m_act = match_mark_action   [scope]
 	| m_act = match_unmark_action [scope]
+	| m_act = match_remark_action [scope]
 ;
 
 // Match mark action
@@ -2748,6 +2760,47 @@ match_unmark_action
 			}
 ;
 
+// Overwrite-match mark action ("remark")
+// Returns 
+match_remark_action
+	[ParsingScope& scope]
+	returns [boost::shared_ptr<Matching::OverwriteMatch> m_act]
+{
+	boost::shared_ptr<Function<Match> > match_to;
+	boost::shared_ptr<Function<Match> > match_from;
+	boost::shared_ptr<Function<Match> > head_match;
+}
+	: "remark" LPAREN 
+			match_from = match_operator[scope] COMMA
+			( match_to  = match_operator[scope] COMMA
+				( head_match = match_operator[scope] COMMA )?
+			)?
+			annotation_name : STRING
+		RPAREN {
+			if (!match_to) {
+				m_act.reset(
+					new Matching::OverwriteMatch(
+						match_from,
+						((antlr::Token*)annotation_name)->getText()));
+			} else {
+				if (!head_match) {
+					m_act.reset(
+						new Matching::OverwriteMatch(
+							match_from,
+							match_to,
+							((antlr::Token*)annotation_name)->getText()));
+				} else {
+					m_act.reset(
+						new Matching::OverwriteMatch(
+							match_from,
+							match_to,
+							head_match,
+							((antlr::Token*)annotation_name)->getText()));
+				}
+			}
+		}
+;
+
 // Match action separated by comma
 // Returns boost::shared_ptr<std::vector<boost::shared_ptr<Matching::MatchAction> > >
 match_action_comma_sep
diff --git a/libwccl/parser/parsingscope.h b/libwccl/parser/parsingscope.h
index f04dd820c458e25ea9ca1c242704c99192998c24..092c4c39be461d4c0eb7c078f936ccee1dbbfbc7 100644
--- a/libwccl/parser/parsingscope.h
+++ b/libwccl/parser/parsingscope.h
@@ -1,3 +1,20 @@
+/*
+    Copyright (C) 2011 Adam Wardyński, Tomasz Śniatowski, Paweł Kędzia,
+    Adam Radziszewski, Bartosz Broda
+    Part of the WCCL project
+
+    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 LICENSE and COPYING files for more details.
+*/
+
 #ifndef LIBWCCL_PARSER_PARSINGSCOPE_H
 #define LIBWCCL_PARSER_PARSINGSCOPE_H
 
diff --git a/libwccl/sentencecontext.cpp b/libwccl/sentencecontext.cpp
index 9fd4b6f3592a7676ee2d05e9a4c2db7501c7dcbc..47fff8c7cc9ebbd44d31d63e4ee00454e3c145f1 100644
--- a/libwccl/sentencecontext.cpp
+++ b/libwccl/sentencecontext.cpp
@@ -1,3 +1,20 @@
+/*
+    Copyright (C) 2011 Adam Wardyński, Tomasz Śniatowski, Paweł Kędzia,
+    Adam Radziszewski, Bartosz Broda
+    Part of the WCCL project
+
+    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 LICENSE and COPYING files for more details.
+*/
+
 #include <libwccl/sentencecontext.h>
 
 namespace Wccl {
diff --git a/libwccl/sentencecontext.h b/libwccl/sentencecontext.h
index 6775ef8d6b3a7a5e72879a0976af4148ecc4c257..ef3213e3a02ad68e3bf7812dd9371d57c509c524 100644
--- a/libwccl/sentencecontext.h
+++ b/libwccl/sentencecontext.h
@@ -1,3 +1,20 @@
+/*
+    Copyright (C) 2011 Adam Wardyński, Tomasz Śniatowski, Paweł Kędzia,
+    Adam Radziszewski, Bartosz Broda
+    Part of the WCCL project
+
+    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 LICENSE and COPYING files for more details.
+*/
+
 #ifndef LIBWCCL_SENTENCECONTEXT_H
 #define LIBWCCL_SENTENCECONTEXT_H
 
diff --git a/libwccl/values/annotationmatch.cpp b/libwccl/values/annotationmatch.cpp
index d13db4e26a12611f4a488d41262499d42c361f47..08d507dc1b62d8d4b338286e9d83ee466c3acebc 100644
--- a/libwccl/values/annotationmatch.cpp
+++ b/libwccl/values/annotationmatch.cpp
@@ -1,3 +1,20 @@
+/*
+    Copyright (C) 2011 Adam Wardyński, Tomasz Śniatowski, Paweł Kędzia,
+    Adam Radziszewski, Bartosz Broda
+    Part of the WCCL project
+
+    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 LICENSE and COPYING files for more details.
+*/
+
 #include <libwccl/values/annotationmatch.h>
 #include <libwccl/values/position.h>
 #include <boost/lexical_cast.hpp>
diff --git a/libwccl/values/annotationmatch.h b/libwccl/values/annotationmatch.h
index 7abc957e766fc8b98d65ef1fff9883a73b74794e..d8c4811f6787baca2ac10fc092f2acf97cd6d6f0 100644
--- a/libwccl/values/annotationmatch.h
+++ b/libwccl/values/annotationmatch.h
@@ -1,3 +1,20 @@
+/*
+    Copyright (C) 2011 Adam Wardyński, Tomasz Śniatowski, Paweł Kędzia,
+    Adam Radziszewski, Bartosz Broda
+    Part of the WCCL project
+
+    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 LICENSE and COPYING files for more details.
+*/
+
 #ifndef LIBWCCL_VALUES_ANNOTATIONMATCH_H
 #define LIBWCCL_VALUES_ANNOTATIONMATCH_H
 
diff --git a/libwccl/values/bool.cpp b/libwccl/values/bool.cpp
index 236472fde352e9b87fa69f8814c57c10543f2b47..84ca2ea2a33b8ec885b48f309374adf416f81e4a 100644
--- a/libwccl/values/bool.cpp
+++ b/libwccl/values/bool.cpp
@@ -1,3 +1,20 @@
+/*
+    Copyright (C) 2011 Adam Wardyński, Tomasz Śniatowski, Paweł Kędzia,
+    Adam Radziszewski, Bartosz Broda
+    Part of the WCCL project
+
+    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 LICENSE and COPYING files for more details.
+*/
+
 #include <libwccl/values/bool.h>
 #include <sstream>
 
diff --git a/libwccl/values/bool.h b/libwccl/values/bool.h
index a9152139dbf66a68a8940d7b01010fc0c469212a..51cdaa4ca08c5ba0e8b9f672955a5254dd359a82 100644
--- a/libwccl/values/bool.h
+++ b/libwccl/values/bool.h
@@ -1,3 +1,20 @@
+/*
+    Copyright (C) 2011 Adam Wardyński, Tomasz Śniatowski, Paweł Kędzia,
+    Adam Radziszewski, Bartosz Broda
+    Part of the WCCL project
+
+    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 LICENSE and COPYING files for more details.
+*/
+
 #ifndef LIBWCCL_VALUES_BOOL_H
 #define LIBWCCL_VALUES_BOOL_H
 
diff --git a/libwccl/values/match.cpp b/libwccl/values/match.cpp
index a0f5cbc6e878a8d0cc5b38338e82049a98a302c3..4064582f06693216342e29bf7c24212dc9c38f77 100644
--- a/libwccl/values/match.cpp
+++ b/libwccl/values/match.cpp
@@ -1,3 +1,20 @@
+/*
+    Copyright (C) 2011 Adam Wardyński, Tomasz Śniatowski, Paweł Kędzia,
+    Adam Radziszewski, Bartosz Broda
+    Part of the WCCL project
+
+    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 LICENSE and COPYING files for more details.
+*/
+
 #include <libwccl/values/match.h>
 #include <sstream>
 
diff --git a/libwccl/values/match.h b/libwccl/values/match.h
index ee6a588efeec10cb94dfeef56bea381c9b88b004..7e0db79716a3e523caa191379cb2fb87917139d8 100644
--- a/libwccl/values/match.h
+++ b/libwccl/values/match.h
@@ -1,3 +1,20 @@
+/*
+    Copyright (C) 2011 Adam Wardyński, Tomasz Śniatowski, Paweł Kędzia,
+    Adam Radziszewski, Bartosz Broda
+    Part of the WCCL project
+
+    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 LICENSE and COPYING files for more details.
+*/
+
 #ifndef LIBWCCL_VALUES_MATCH_H
 #define LIBWCCL_VALUES_MATCH_H
 
diff --git a/libwccl/values/matchdata.h b/libwccl/values/matchdata.h
index d415f9f6b93bb11b07b8892651d495487133af55..4c24690461a56d484cc1e5eeebe640708b55041f 100644
--- a/libwccl/values/matchdata.h
+++ b/libwccl/values/matchdata.h
@@ -1,3 +1,20 @@
+/*
+    Copyright (C) 2011 Adam Wardyński, Tomasz Śniatowski, Paweł Kędzia,
+    Adam Radziszewski, Bartosz Broda
+    Part of the WCCL project
+
+    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 LICENSE and COPYING files for more details.
+*/
+
 #ifndef LIBWCCL_VALUES_MATCHDATA_H
 #define LIBWCCL_VALUES_MATCHDATA_H
 
diff --git a/libwccl/values/matchvector.cpp b/libwccl/values/matchvector.cpp
index 7fb0ab019bb209ed32f1e0c2b8155c34250bee40..63fbd687a4e6ad3620440769655a21da527a3e28 100644
--- a/libwccl/values/matchvector.cpp
+++ b/libwccl/values/matchvector.cpp
@@ -1,3 +1,20 @@
+/*
+    Copyright (C) 2011 Adam Wardyński, Tomasz Śniatowski, Paweł Kędzia,
+    Adam Radziszewski, Bartosz Broda
+    Part of the WCCL project
+
+    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 LICENSE and COPYING files for more details.
+*/
+
 #include <libwccl/values/matchvector.h>
 #include <libwccl/values/match.h>
 #include <libpwrutils/foreach.h>
diff --git a/libwccl/values/matchvector.h b/libwccl/values/matchvector.h
index c97f7d9cd2b76b79de04ed804e604cff7223140a..dd766089527f696379aafb845684116aed6f419a 100644
--- a/libwccl/values/matchvector.h
+++ b/libwccl/values/matchvector.h
@@ -1,3 +1,20 @@
+/*
+    Copyright (C) 2011 Adam Wardyński, Tomasz Śniatowski, Paweł Kędzia,
+    Adam Radziszewski, Bartosz Broda
+    Part of the WCCL project
+
+    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 LICENSE and COPYING files for more details.
+*/
+
 #ifndef LIBWCCL_VALUES_MATCHVECTOR_H
 #define LIBWCCL_VALUES_MATCHVECTOR_H
 
diff --git a/libwccl/values/position.cpp b/libwccl/values/position.cpp
index 41a5abaa7a1546941e55f0e5f4fd7acc99465a28..98cc278d0e1d2b1693e11d97a59052a0ece9d2b0 100644
--- a/libwccl/values/position.cpp
+++ b/libwccl/values/position.cpp
@@ -1,3 +1,20 @@
+/*
+    Copyright (C) 2011 Adam Wardyński, Tomasz Śniatowski, Paweł Kędzia,
+    Adam Radziszewski, Bartosz Broda
+    Part of the WCCL project
+
+    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 LICENSE and COPYING files for more details.
+*/
+
 #include <libwccl/values/position.h>
 #include <libwccl/sentencecontext.h>
 #include <boost/lexical_cast.hpp>
diff --git a/libwccl/values/position.h b/libwccl/values/position.h
index 943f2805931d5c3f402655c755020e03ad71a222..0f084521c06d245eb19176a210342f233a931aaa 100644
--- a/libwccl/values/position.h
+++ b/libwccl/values/position.h
@@ -1,3 +1,20 @@
+/*
+    Copyright (C) 2011 Adam Wardyński, Tomasz Śniatowski, Paweł Kędzia,
+    Adam Radziszewski, Bartosz Broda
+    Part of the WCCL project
+
+    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 LICENSE and COPYING files for more details.
+*/
+
 #ifndef LIBWCCL_VALUES_POSITION_H
 #define LIBWCCL_VALUES_POSITION_H
 
diff --git a/libwccl/values/strset.cpp b/libwccl/values/strset.cpp
index 5eebd4042e5185f466b091e03739f998f5504b86..16defa1e4f1cb2f5eaa0771f20503b313205bf2a 100644
--- a/libwccl/values/strset.cpp
+++ b/libwccl/values/strset.cpp
@@ -1,3 +1,20 @@
+/*
+    Copyright (C) 2011 Adam Wardyński, Tomasz Śniatowski, Paweł Kędzia,
+    Adam Radziszewski, Bartosz Broda
+    Part of the WCCL project
+
+    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 LICENSE and COPYING files for more details.
+*/
+
 #include <libwccl/values/strset.h>
 #include <libpwrutils/foreach.h>
 #include <libpwrutils/util.h>
diff --git a/libwccl/values/strset.h b/libwccl/values/strset.h
index 0de7a5de17adc7aa12cb33b9f429cca6499e02ee..278a41c30459db8edb14e6aa4117042869dd7118 100644
--- a/libwccl/values/strset.h
+++ b/libwccl/values/strset.h
@@ -1,3 +1,20 @@
+/*
+    Copyright (C) 2011 Adam Wardyński, Tomasz Śniatowski, Paweł Kędzia,
+    Adam Radziszewski, Bartosz Broda
+    Part of the WCCL project
+
+    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 LICENSE and COPYING files for more details.
+*/
+
 #ifndef LIBWCCL_VALUES_STRSET_H
 #define LIBWCCL_VALUES_STRSET_H
 
diff --git a/libwccl/values/tokenmatch.cpp b/libwccl/values/tokenmatch.cpp
index 7cd31cf0fd9a7962ee37549366d70e5674a2fee2..753169ef96b44cad5c5cc8a9d4f44bc94f3dd300 100644
--- a/libwccl/values/tokenmatch.cpp
+++ b/libwccl/values/tokenmatch.cpp
@@ -1,3 +1,20 @@
+/*
+    Copyright (C) 2011 Adam Wardyński, Tomasz Śniatowski, Paweł Kędzia,
+    Adam Radziszewski, Bartosz Broda
+    Part of the WCCL project
+
+    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 LICENSE and COPYING files for more details.
+*/
+
 #include <libwccl/values/tokenmatch.h>
 #include <boost/lexical_cast.hpp>
 
diff --git a/libwccl/values/tokenmatch.h b/libwccl/values/tokenmatch.h
index 99382f70c861e86ec5660ca6553207791e59f209..3840c45d1d474f7ef42888032393bd8c432cb044 100644
--- a/libwccl/values/tokenmatch.h
+++ b/libwccl/values/tokenmatch.h
@@ -1,3 +1,20 @@
+/*
+    Copyright (C) 2011 Adam Wardyński, Tomasz Śniatowski, Paweł Kędzia,
+    Adam Radziszewski, Bartosz Broda
+    Part of the WCCL project
+
+    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 LICENSE and COPYING files for more details.
+*/
+
 #ifndef LIBWCCL_VALUES_TOKENMATCH_H
 #define LIBWCCL_VALUES_TOKENMATCH_H
 
diff --git a/libwccl/values/tset.cpp b/libwccl/values/tset.cpp
index 27760fbf1dae7daa0d0d91beb65fcb1d855d2bec..968f6e848a8e347a10d0aed9a3e638892bab4d08 100644
--- a/libwccl/values/tset.cpp
+++ b/libwccl/values/tset.cpp
@@ -1,3 +1,20 @@
+/*
+    Copyright (C) 2011 Adam Wardyński, Tomasz Śniatowski, Paweł Kędzia,
+    Adam Radziszewski, Bartosz Broda
+    Part of the WCCL project
+
+    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 LICENSE and COPYING files for more details.
+*/
+
 #include <libwccl/values/tset.h>
 #include <libpwrutils/foreach.h>
 #include <libpwrutils/bitset.h>
diff --git a/libwccl/values/tset.h b/libwccl/values/tset.h
index 41ff34f88568a50fb370235cf408061bd79d2c8c..77f0eeccfc433f944339b23805a3e85b617ff23d 100644
--- a/libwccl/values/tset.h
+++ b/libwccl/values/tset.h
@@ -1,3 +1,20 @@
+/*
+    Copyright (C) 2011 Adam Wardyński, Tomasz Śniatowski, Paweł Kędzia,
+    Adam Radziszewski, Bartosz Broda
+    Part of the WCCL project
+
+    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 LICENSE and COPYING files for more details.
+*/
+
 #ifndef LIBWCCL_VALUES_TSET_H
 #define LIBWCCL_VALUES_TSET_H
 
diff --git a/libwccl/values/value.cpp b/libwccl/values/value.cpp
index 138b4c3e8b806fddfdd7b0e1de8e5c89324dcd12..f0ba80d80f78f085b1ff6611d9814904962ced82 100644
--- a/libwccl/values/value.cpp
+++ b/libwccl/values/value.cpp
@@ -1,3 +1,20 @@
+/*
+    Copyright (C) 2011 Adam Wardyński, Tomasz Śniatowski, Paweł Kędzia,
+    Adam Radziszewski, Bartosz Broda
+    Part of the WCCL project
+
+    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 LICENSE and COPYING files for more details.
+*/
+
 #include <libwccl/values/value.h>
 
 namespace Wccl {
diff --git a/libwccl/values/value.h b/libwccl/values/value.h
index 702175c757e675f0cbcb9530d0e5e563b6080f15..ae11a31f387496f560572e5e93dc61aa98793bec 100644
--- a/libwccl/values/value.h
+++ b/libwccl/values/value.h
@@ -1,3 +1,20 @@
+/*
+    Copyright (C) 2011 Adam Wardyński, Tomasz Śniatowski, Paweł Kędzia,
+    Adam Radziszewski, Bartosz Broda
+    Part of the WCCL project
+
+    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 LICENSE and COPYING files for more details.
+*/
+
 #ifndef LIBWCCL_VALUES_VALUE_H
 #define LIBWCCL_VALUES_VALUE_H
 
diff --git a/libwccl/variables.cpp b/libwccl/variables.cpp
index 8707f3dae3cd1c523303d3062d24f77db2c4f9c2..5e938d990e578ab2d73ae50b9e0e2694df2791e4 100644
--- a/libwccl/variables.cpp
+++ b/libwccl/variables.cpp
@@ -1,3 +1,20 @@
+/*
+    Copyright (C) 2011 Adam Wardyński, Tomasz Śniatowski, Paweł Kędzia,
+    Adam Radziszewski, Bartosz Broda
+    Part of the WCCL project
+
+    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 LICENSE and COPYING files for more details.
+*/
+
 #include <libwccl/variables.h>
 #include <boost/mpl/always.hpp>
 #include <boost/mpl/pop_front.hpp>
diff --git a/libwccl/variables.h b/libwccl/variables.h
index 5c9e88d00b273c66749220c129a948dd5a434356..ef7ede505674226c8c9c02d544019e2e03deb0de 100644
--- a/libwccl/variables.h
+++ b/libwccl/variables.h
@@ -1,3 +1,20 @@
+/*
+    Copyright (C) 2011 Adam Wardyński, Tomasz Śniatowski, Paweł Kędzia,
+    Adam Radziszewski, Bartosz Broda
+    Part of the WCCL project
+
+    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 LICENSE and COPYING files for more details.
+*/
+
 #ifndef LIBWCCL_VARIABLES_H
 #define LIBWCCL_VARIABLES_H
 
diff --git a/libwccl/version.in b/libwccl/version.in
new file mode 100644
index 0000000000000000000000000000000000000000..51488ed26f25b93b8b786cfc7a2de968f4868fb4
--- /dev/null
+++ b/libwccl/version.in
@@ -0,0 +1,9 @@
+#ifndef LIBWCCL_VERSION_H
+#define LIBWCCL_VERSION_H
+
+#define LIBWCCL_VERSION_MAJOR @wccl_ver_major@
+#define LIBWCCL_VERSION_MINOR @wccl_ver_minor@
+#define LIBWCCL_VERSION_PATCH @wccl_ver_patch@
+#define LIBWCCL_VERSION "@LIBWCCL_VERSION@"
+
+#endif
diff --git a/libwccl/wcclfile.cpp b/libwccl/wcclfile.cpp
index 132fddfa489ab0240c07c91fafc323978bef39c3..d8664368e7573a0ac2bd00e6afc72f0afb410758 100644
--- a/libwccl/wcclfile.cpp
+++ b/libwccl/wcclfile.cpp
@@ -1,3 +1,20 @@
+/*
+    Copyright (C) 2011 Adam Wardyński, Tomasz Śniatowski, Paweł Kędzia,
+    Adam Radziszewski, Bartosz Broda
+    Part of the WCCL project
+
+    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 LICENSE and COPYING files for more details.
+*/
+
 #include <libwccl/wcclfile.h>
 
 namespace Wccl {
diff --git a/libwccl/wcclfile.h b/libwccl/wcclfile.h
index 709ea59bc3872060572859d6c44981f22149d4e2..1989fe7c5dd415ca6c1782ca1a1be5a9061733a4 100644
--- a/libwccl/wcclfile.h
+++ b/libwccl/wcclfile.h
@@ -1,3 +1,20 @@
+/*
+    Copyright (C) 2011 Adam Wardyński, Tomasz Śniatowski, Paweł Kędzia,
+    Adam Radziszewski, Bartosz Broda
+    Part of the WCCL project
+
+    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 LICENSE and COPYING files for more details.
+*/
+
 #ifndef LIBWCCL_WCCLFILE_H
 #define LIBWCCL_WCCLFILE_H
 
diff --git a/libwccl/wcclfileopsections.h b/libwccl/wcclfileopsections.h
index 49e7ae77194db4017e2c0b4546432a2cdc6a2b13..bfc90b3b0627bd06d255f9a40a83a8da9aeefd1f 100644
--- a/libwccl/wcclfileopsections.h
+++ b/libwccl/wcclfileopsections.h
@@ -1,3 +1,20 @@
+/*
+    Copyright (C) 2011 Adam Wardyński, Tomasz Śniatowski, Paweł Kędzia,
+    Adam Radziszewski, Bartosz Broda
+    Part of the WCCL project
+
+    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 LICENSE and COPYING files for more details.
+*/
+
 #ifndef LIBWCCL_WCCLFILEOPSECTIONS_H
 #define LIBWCCL_WCCLFILEOPSECTIONS_H
 
diff --git a/licensify.sh b/licensify.sh
new file mode 100755
index 0000000000000000000000000000000000000000..1082d76ea0a279320aa1b790fdf1d08d22c6e708
--- /dev/null
+++ b/licensify.sh
@@ -0,0 +1,5 @@
+#!/bin/bash
+find -name '*.h' -or -name '*.cpp' | while read file; do
+	cat LICENSE.in $file > $file.new && mv $file.new $file
+done
+
diff --git a/swig/matchrulesequence.i b/swig/matchrulesequence.i
index f746531ab45d5ac571465e6b177d9e0aeb760f03..d45853b668d8c72bf28ca7d1bf5ca287c20f6c3b 100644
--- a/swig/matchrulesequence.i
+++ b/swig/matchrulesequence.i
@@ -9,14 +9,17 @@
 %include "matchrule.i"
 %include "expression.i"
 %include "libcorpus2/annotatedsentence.i"
+%include "libcorpus2/sentence.i"
 
 %include "std_string.i"
 %include "std_vector.i"
 %include <libcorpus2/boost_shared_ptr.i>
 
 %template(MatchRuleVector) std::vector<Wccl::Matching::MatchRule>;
-%template(MatchRuleSequencePtr) boost::shared_ptr<Wccl::Matching::MatchRule>;
-%template(ConstMatchRuleSequencePtr) boost::shared_ptr<const Wccl::Matching::MatchRule>;
+%template(MatchRulePtr) boost::shared_ptr<Wccl::Matching::MatchRule>;
+%template(ConstMatchRuleSequencePtr) boost::shared_ptr<const Wccl::Matching::MatchRuleSequence>;
+%template(MatchRuleSequencePtr) boost::shared_ptr<Wccl::Matching::MatchRuleSequence>;
+%template(ConstMatchRulePtr) boost::shared_ptr<const Wccl::Matching::MatchRule>;
 
 namespace Wccl {
 namespace Matching {
@@ -33,6 +36,7 @@ namespace Matching {
     /* --------------------------------------------------------------------- */
 
     void apply_all(const shared_ptr<Corpus2::AnnotatedSentence>& sentence);
+    void apply_all_sentence_wrapper(const shared_ptr<Corpus2::Sentence>& sentence);
 
     /* --------------------------------------------------------------------- */
 
diff --git a/tests/ann_op.cpp b/tests/ann_op.cpp
index 5fcd11ec75b5ac0127899a6230b88ec4d6fdc34f..bf2bf7cb489924d0a5113d377728ca3bbed06241 100644
--- a/tests/ann_op.cpp
+++ b/tests/ann_op.cpp
@@ -1,3 +1,20 @@
+/*
+    Copyright (C) 2011 Adam Wardyński, Tomasz Śniatowski, Paweł Kędzia,
+    Adam Radziszewski, Bartosz Broda
+    Part of the WCCL project
+
+    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 LICENSE and COPYING files for more details.
+*/
+
 #include <boost/test/unit_test.hpp>
 #include <boost/bind.hpp>
 #include <libcorpus2/ann/annotatedsentence.h>
diff --git a/tests/conditional.cpp b/tests/conditional.cpp
index f7cff57825d8d596c145105d558baea606da4212..1646622065da98734ba592b47b3415c14c25b63a 100644
--- a/tests/conditional.cpp
+++ b/tests/conditional.cpp
@@ -1,3 +1,20 @@
+/*
+    Copyright (C) 2011 Adam Wardyński, Tomasz Śniatowski, Paweł Kędzia,
+    Adam Radziszewski, Bartosz Broda
+    Part of the WCCL project
+
+    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 LICENSE and COPYING files for more details.
+*/
+
 #include <boost/test/unit_test.hpp>
 #include <boost/bind.hpp>
 #include <boost/shared_ptr.hpp>
diff --git a/tests/constant.cpp b/tests/constant.cpp
index 47e4fb25a28f802342e97e2887f1e86cdcf55fcc..fbae3016a89c80acc64f799d417f929b558e23cd 100644
--- a/tests/constant.cpp
+++ b/tests/constant.cpp
@@ -1,3 +1,20 @@
+/*
+    Copyright (C) 2011 Adam Wardyński, Tomasz Śniatowski, Paweł Kędzia,
+    Adam Radziszewski, Bartosz Broda
+    Part of the WCCL project
+
+    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 LICENSE and COPYING files for more details.
+*/
+
 #include <boost/test/unit_test.hpp>
 #include <boost/bind.hpp>
 #include <boost/shared_ptr.hpp>
diff --git a/tests/context.cpp b/tests/context.cpp
index 4359dc678d8b21314475bc63e2560a5bd93b9d73..a1d5a77e17983736cad3b5de3f0609794d00c8c8 100644
--- a/tests/context.cpp
+++ b/tests/context.cpp
@@ -1,3 +1,20 @@
+/*
+    Copyright (C) 2011 Adam Wardyński, Tomasz Śniatowski, Paweł Kędzia,
+    Adam Radziszewski, Bartosz Broda
+    Part of the WCCL project
+
+    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 LICENSE and COPYING files for more details.
+*/
+
 #include <boost/test/unit_test.hpp>
 #include <boost/bind.hpp>
 
diff --git a/tests/data/class.ccl b/tests/data/class.ccl
new file mode 100644
index 0000000000000000000000000000000000000000..4912034e92e0a13f537973f76b5e04067bf24ea2
--- /dev/null
+++ b/tests/data/class.ccl
@@ -0,0 +1,7 @@
+sentence=to.xml
+tagset=nkjp
+---
+class[0] // to tylko[0] komentarz orth[1]
+
+{adj,conj,pred,qub,subst}
+---
diff --git a/tests/data/interp.xml b/tests/data/interp.xml
new file mode 100644
index 0000000000000000000000000000000000000000..782a60c59e9cf2e2cc448c8f161a7eaf41933e7b
--- /dev/null
+++ b/tests/data/interp.xml
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE cesAna SYSTEM "xcesAnaIPI.dtd">
+<cesAna xmlns:xlink="http://www.w3.org/1999/xlink" version="1.0" type="lex disamb">
+<chunkList>
+ <chunk>
+  <chunk type="s">
+   <tok>
+    <orth>IdÄ™</orth>
+    <lex><base>iść</base><ctag>verb</ctag></lex>
+   </tok>
+   <tok>
+    <orth>na</orth>
+    <lex><base>na</base><ctag>other</ctag></lex>
+   </tok>
+   <tok>
+    <orth>„</orth>
+    <lex><base>„</base><ctag>interp</ctag></lex>
+   </tok>
+   <ns/>
+   <tok>
+    <orth>Czarnego</orth>
+    <lex><base>czarny</base><ctag>adj</ctag></lex>
+   </tok>
+   <tok>
+    <orth>Kota</orth>
+    <lex><base>kot</base><ctag>noun</ctag></lex>
+    <lex><base>kota</base><ctag>noun</ctag></lex>
+   </tok>
+   <tok>
+    <orth>(</orth>
+    <lex><base>(</base><ctag>interp</ctag></lex>
+   </tok>
+   <ns/>
+   <tok>
+    <orth>1998</orth>
+    <lex><base>1998</base><ctag>unk</ctag></lex>
+   </tok>
+   <ns/>
+   <tok>
+    <orth>)</orth>
+    <lex><base>)</base><ctag>interp</ctag></lex>
+   </tok>
+   <ns/>
+   <tok>
+    <orth>”</orth>
+    <lex><base>”</base><ctag>interp</ctag></lex>
+   </tok>
+   <tok>
+    <orth>do</orth>
+    <lex><base>do</base><ctag>other</ctag></lex>
+   </tok>
+   <tok>
+    <orth>kina</orth>
+    <lex><base>kino</base><ctag>noun</ctag></lex>
+   </tok>
+   <tok>
+    <orth>—</orth>
+    <lex><base>—</base><ctag>interp</ctag></lex>
+   </tok>
+   <tok>
+    <orth>już</orth>
+    <lex><base>już</base><ctag>qub</ctag></lex>
+   </tok>
+   <tok>
+    <orth>czas</orth>
+    <lex><base>czas</base><ctag>noun</ctag></lex>
+    <lex><base>czas</base><ctag>verb</ctag></lex>
+   </tok>
+   <ns/>
+   <tok>
+    <orth>.</orth>
+    <lex><base>.</base><ctag>interp</ctag></lex>
+   </tok>
+  </chunk>
+ </chunk>
+</chunkList>
+</cesAna>
diff --git a/tests/data/skip-iter.ccl b/tests/data/skip-iter.ccl
new file mode 100644
index 0000000000000000000000000000000000000000..5aad8691786704504672378279211041d4f5c2c3
--- /dev/null
+++ b/tests/data/skip-iter.ccl
@@ -0,0 +1,84 @@
+tagset=simple
+sentence=interp.xml
+---
+skip(0,$P, inter(class[$P],interp), 0)
+
+True
+P=0
+---
+skip(0,$P, inter(class[$P],interp), 1)
+
+True
+P=1
+---
+skip(0,$P, inter(class[$P],interp), 8)
+
+True
+P=13
+---
+skip(-1,$P, inter(class[$P],interp), 0)
+
+False
+P=nowhere
+---
+skip(0,$P, inter(class[$P],interp), 1)
+
+True
+P=1
+---
+skip(0,$P, inter(class[$P],interp), 2)
+
+True
+P=3
+---
+skip(0,$P, inter(class[$P],interp), 3)
+
+True
+P=4
+---
+
+skip(0,$P, inter(class[$P],interp), 5)
+
+True
+P=9
+---
+skip(0,$P, inter(class[$P],interp), 9) // OOS
+
+False
+P=nowhere
+---
+skip(2,$P, inter(class[$P],interp), 0) // at skipped
+
+True
+P=2
+---
+skip(2,$P, inter(class[$P],interp), 1) // at skipped
+
+True
+P=3
+---
+skip(2,$P, inter(class[$P],interp), -1) // at skipped
+
+True
+P=1
+---
+skip(11,$P, inter(class[$P],interp), -1) // już -> kina
+
+True
+P=10
+---
+skip(11,$P, inter(class[$P],interp), -2) // już -> do
+
+True
+P=9
+---
+skip(11,$P, inter(class[$P],interp), -6) // już -> na
+
+True
+P=1
+---
+skip(11,$P, inter(class[$P],interp), -8) // już -> OOS
+
+False
+P=nowhere
+---
diff --git a/tests/data/to.xml b/tests/data/to.xml
new file mode 100644
index 0000000000000000000000000000000000000000..6fbb467af0285bcedb188cd949cf4842c3d5f3db
--- /dev/null
+++ b/tests/data/to.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE cesAna SYSTEM "xcesAnaIPI.dtd">
+<cesAna xmlns:xlink="http://www.w3.org/1999/xlink" version="1.0" type="lex disamb">
+<chunkList>
+ <chunk type="s">
+  <tok>
+   <orth>to</orth>
+   <lex><base>ten</base><ctag>adj:sg:nom:n:pos</ctag></lex>
+   <lex><base>ten</base><ctag>adj:sg:acc:n:pos</ctag></lex>
+   <lex><base>ten</base><ctag>adj:sg:voc:n:pos</ctag></lex>
+   <lex><base>to</base><ctag>conj</ctag></lex>
+   <lex><base>to</base><ctag>pred</ctag></lex>
+   <lex><base>to</base><ctag>qub</ctag></lex>
+   <lex><base>to</base><ctag>subst:sg:nom:n</ctag></lex>
+   <lex><base>to</base><ctag>subst:sg:acc:n</ctag></lex>
+  </tok>
+ </chunk>
+</chunkList>
+</cesAna>
diff --git a/tests/datadriven.cpp b/tests/datadriven.cpp
index bbfce4ff1a6548f196c9fee63805880162de9f21..a9bf16830660601e0ffa85d164b8286762f14622 100644
--- a/tests/datadriven.cpp
+++ b/tests/datadriven.cpp
@@ -1,3 +1,20 @@
+/*
+    Copyright (C) 2011 Adam Wardyński, Tomasz Śniatowski, Paweł Kędzia,
+    Adam Radziszewski, Bartosz Broda
+    Part of the WCCL project
+
+    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 LICENSE and COPYING files for more details.
+*/
+
 #include "datadriven.h"
 
 #include <libpwrutils/util.h>
diff --git a/tests/datadriven.h b/tests/datadriven.h
index 513e89965dd7e8e67a37cbb769a961d896d3d088..a070b65b8ec168ec2b78a9329e4b230a4e929fac 100644
--- a/tests/datadriven.h
+++ b/tests/datadriven.h
@@ -1,3 +1,20 @@
+/*
+    Copyright (C) 2011 Adam Wardyński, Tomasz Śniatowski, Paweł Kędzia,
+    Adam Radziszewski, Bartosz Broda
+    Part of the WCCL project
+
+    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 LICENSE and COPYING files for more details.
+*/
+
 #ifndef LIBWCCL_TESTS_DATADRIVEN_H
 #define LIBWCCL_TESTS_DATADRIVEN_H
 
diff --git a/tests/datarule.cpp b/tests/datarule.cpp
index 736ef8c909c80f66b7940c6cb3bf6ea38e110cbf..6a91c82ea5f4135a2dea0dfda80cdec65333c74a 100644
--- a/tests/datarule.cpp
+++ b/tests/datarule.cpp
@@ -1,3 +1,20 @@
+/*
+    Copyright (C) 2011 Adam Wardyński, Tomasz Śniatowski, Paweł Kędzia,
+    Adam Radziszewski, Bartosz Broda
+    Part of the WCCL project
+
+    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 LICENSE and COPYING files for more details.
+*/
+
 #include "datadriven.h"
 
 #include <antlr/RecognitionException.hpp>
diff --git a/tests/datarule.h b/tests/datarule.h
index 10da9c2d44ad75b5ee6fb1cebdc45ec9b3658509..76ad937d7d23aa8d3b7d0cb079f8bd210593b13f 100644
--- a/tests/datarule.h
+++ b/tests/datarule.h
@@ -1,3 +1,20 @@
+/*
+    Copyright (C) 2011 Adam Wardyński, Tomasz Śniatowski, Paweł Kędzia,
+    Adam Radziszewski, Bartosz Broda
+    Part of the WCCL project
+
+    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 LICENSE and COPYING files for more details.
+*/
+
 #ifndef LIBWCCL_TESTS_DATADRULE_H
 #define LIBWCCL_TESTS_DATADRULE_H
 
diff --git a/tests/getlemmas.cpp b/tests/getlemmas.cpp
index a6a83f927aae5750ba6e1593c6184687db78a86d..3fc7e33fedec31824ae6a31b4010131abe323a15 100644
--- a/tests/getlemmas.cpp
+++ b/tests/getlemmas.cpp
@@ -1,3 +1,20 @@
+/*
+    Copyright (C) 2011 Adam Wardyński, Tomasz Śniatowski, Paweł Kędzia,
+    Adam Radziszewski, Bartosz Broda
+    Part of the WCCL project
+
+    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 LICENSE and COPYING files for more details.
+*/
+
 #include <boost/test/unit_test.hpp>
 #include <boost/bind.hpp>
 #include <boost/shared_ptr.hpp>
diff --git a/tests/getorth.cpp b/tests/getorth.cpp
index 3599cb3b6ac68d742146eadacbf507198387c982..040786ea1dc198e4b1fecd6503f597e47a71f475 100644
--- a/tests/getorth.cpp
+++ b/tests/getorth.cpp
@@ -1,3 +1,20 @@
+/*
+    Copyright (C) 2011 Adam Wardyński, Tomasz Śniatowski, Paweł Kędzia,
+    Adam Radziszewski, Bartosz Broda
+    Part of the WCCL project
+
+    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 LICENSE and COPYING files for more details.
+*/
+
 #include <boost/test/unit_test.hpp>
 #include <boost/bind.hpp>
 #include <boost/shared_ptr.hpp>
diff --git a/tests/getsymbols.cpp b/tests/getsymbols.cpp
index f44149f2b50fc690c83792c0e5aa34711f659d80..87b72a6301d943dd768b99f7ad2c336ab1cba763 100644
--- a/tests/getsymbols.cpp
+++ b/tests/getsymbols.cpp
@@ -1,3 +1,20 @@
+/*
+    Copyright (C) 2011 Adam Wardyński, Tomasz Śniatowski, Paweł Kędzia,
+    Adam Radziszewski, Bartosz Broda
+    Part of the WCCL project
+
+    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 LICENSE and COPYING files for more details.
+*/
+
 #include <boost/test/unit_test.hpp>
 #include <boost/bind.hpp>
 #include <boost/shared_ptr.hpp>
@@ -44,7 +61,7 @@ struct SymbolsFix : public Wccl::PositionFixture
 		gnd = tagset.parse_symbol("gnd");
 		nmb = tagset.parse_symbol("nmb");
 		vcl = tagset.parse_symbol("vcl");
-		tag_pos.set_pos(-1); //todo
+		tag_pos.set_pos(Corpus2::filled_mask);
 	}
 
 	boost::shared_ptr<Corpus2::Sentence> s;
diff --git a/tests/getsymbolsinrange.cpp b/tests/getsymbolsinrange.cpp
index b5b9cf02519ccb8d2987f301db6f01f15094f407..9276db81a2e23649a6db7bb411241b56eb824a5f 100644
--- a/tests/getsymbolsinrange.cpp
+++ b/tests/getsymbolsinrange.cpp
@@ -1,3 +1,20 @@
+/*
+    Copyright (C) 2011 Adam Wardyński, Tomasz Śniatowski, Paweł Kędzia,
+    Adam Radziszewski, Bartosz Broda
+    Part of the WCCL project
+
+    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 LICENSE and COPYING files for more details.
+*/
+
 #include <boost/test/unit_test.hpp>
 #include <boost/bind.hpp>
 #include <boost/shared_ptr.hpp>
diff --git a/tests/isempty.cpp b/tests/isempty.cpp
index 0256bd570281e21390915f64419a81886bf52cb5..a148a8529bd2f80628b7fb87f4093cb22511be7e 100644
--- a/tests/isempty.cpp
+++ b/tests/isempty.cpp
@@ -1,3 +1,20 @@
+/*
+    Copyright (C) 2011 Adam Wardyński, Tomasz Śniatowski, Paweł Kędzia,
+    Adam Radziszewski, Bartosz Broda
+    Part of the WCCL project
+
+    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 LICENSE and COPYING files for more details.
+*/
+
 #include <boost/test/unit_test.hpp>
 #include <boost/bind.hpp>
 #include <boost/shared_ptr.hpp>
diff --git a/tests/logicalpredicates.cpp b/tests/logicalpredicates.cpp
index b5cc62b8fa29f1e89140b3e26c6817e3d117ef0f..d4b3fb5955d90e0a1306314de19473eb0e8ad779 100644
--- a/tests/logicalpredicates.cpp
+++ b/tests/logicalpredicates.cpp
@@ -1,3 +1,20 @@
+/*
+    Copyright (C) 2011 Adam Wardyński, Tomasz Śniatowski, Paweł Kędzia,
+    Adam Radziszewski, Bartosz Broda
+    Part of the WCCL project
+
+    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 LICENSE and COPYING files for more details.
+*/
+
 #include <boost/test/unit_test.hpp>
 #include <boost/bind.hpp>
 #include <boost/shared_ptr.hpp>
diff --git a/tests/main.cpp b/tests/main.cpp
index 0f24bf9d1cbefa6fc6bb589b452de834fc8a88df..90240bf9ffee6d27adde261d1e71f19d23881427 100644
--- a/tests/main.cpp
+++ b/tests/main.cpp
@@ -1,3 +1,20 @@
+/*
+    Copyright (C) 2011 Adam Wardyński, Tomasz Śniatowski, Paweł Kędzia,
+    Adam Radziszewski, Bartosz Broda
+    Part of the WCCL project
+
+    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 LICENSE and COPYING files for more details.
+*/
+
 //#define BOOST_TEST_MODULE master
 #include <boost/test/included/unit_test.hpp>
 #include <unicode/uclean.h>
diff --git a/tests/mark.cpp b/tests/mark.cpp
index afec4aea022434436ff00660834e416655cac54c..a6f36e18bef1beb0e10a4ddfe7afa3fe2d80e168 100644
--- a/tests/mark.cpp
+++ b/tests/mark.cpp
@@ -1,3 +1,20 @@
+/*
+    Copyright (C) 2011 Adam Wardyński, Tomasz Śniatowski, Paweł Kędzia,
+    Adam Radziszewski, Bartosz Broda
+    Part of the WCCL project
+
+    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 LICENSE and COPYING files for more details.
+*/
+
 #include <boost/test/unit_test.hpp>
 #include <boost/bind.hpp>
 #include <libcorpus2/ann/annotatedsentence.h>
diff --git a/tests/match.cpp b/tests/match.cpp
index 9a7008bdcf30719664e661b6a47a547ff47571a8..508842f91c943bfe54c3e77f37bf3c03b134896b 100644
--- a/tests/match.cpp
+++ b/tests/match.cpp
@@ -1,3 +1,20 @@
+/*
+    Copyright (C) 2011 Adam Wardyński, Tomasz Śniatowski, Paweł Kędzia,
+    Adam Radziszewski, Bartosz Broda
+    Part of the WCCL project
+
+    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 LICENSE and COPYING files for more details.
+*/
+
 #include <boost/test/unit_test.hpp>
 #include <boost/bind.hpp>
 #include <libcorpus2/tagsetmanager.h>
diff --git a/tests/optest.cpp b/tests/optest.cpp
index a0be3896bf0c3895b56074c12e10b955b97a69e8..8359eea14cfb8586b7c7bd2b5bb119465eb70c92 100644
--- a/tests/optest.cpp
+++ b/tests/optest.cpp
@@ -1,3 +1,20 @@
+/*
+    Copyright (C) 2011 Adam Wardyński, Tomasz Śniatowski, Paweł Kędzia,
+    Adam Radziszewski, Bartosz Broda
+    Part of the WCCL project
+
+    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 LICENSE and COPYING files for more details.
+*/
+
 #include "optest.h"
 
 namespace Wccl {
diff --git a/tests/optest.h b/tests/optest.h
index b9fa586cc5e9d2ceeb611d32e49ccff8cc8567a0..7dd4dd2a2d954f9952e9d6fedbb6737b6cd39d3f 100644
--- a/tests/optest.h
+++ b/tests/optest.h
@@ -1,3 +1,20 @@
+/*
+    Copyright (C) 2011 Adam Wardyński, Tomasz Śniatowski, Paweł Kędzia,
+    Adam Radziszewski, Bartosz Broda
+    Part of the WCCL project
+
+    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 LICENSE and COPYING files for more details.
+*/
+
 #ifndef LIBWCCL_TESTS_OPTEST_H
 #define LIBWCCL_TESTS_OPTEST_H
 
diff --git a/tests/position.cpp b/tests/position.cpp
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..64c3259934d358c96c2009c2e69011c735722461 100644
--- a/tests/position.cpp
+++ b/tests/position.cpp
@@ -0,0 +1,17 @@
+/*
+    Copyright (C) 2011 Adam Wardyński, Tomasz Śniatowski, Paweł Kędzia,
+    Adam Radziszewski, Bartosz Broda
+    Part of the WCCL project
+
+    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 LICENSE and COPYING files for more details.
+*/
+
diff --git a/tests/positionpredicates.cpp b/tests/positionpredicates.cpp
index f8917415b5419ea4568786ac48fe6e239444f057..cd5174883d7b57e8a17509fe0a392693e9d6c274 100644
--- a/tests/positionpredicates.cpp
+++ b/tests/positionpredicates.cpp
@@ -1,3 +1,20 @@
+/*
+    Copyright (C) 2011 Adam Wardyński, Tomasz Śniatowski, Paweł Kędzia,
+    Adam Radziszewski, Bartosz Broda
+    Part of the WCCL project
+
+    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 LICENSE and COPYING files for more details.
+*/
+
 #include <boost/test/unit_test.hpp>
 #include <boost/bind.hpp>
 #include <boost/shared_ptr.hpp>
diff --git a/tests/regex.cpp b/tests/regex.cpp
index b27a72eaef284a52c1f58a358a011c7d11ac15ba..54e558954b82f3d2b31c21f428d78f88865e77dc 100644
--- a/tests/regex.cpp
+++ b/tests/regex.cpp
@@ -1,3 +1,20 @@
+/*
+    Copyright (C) 2011 Adam Wardyński, Tomasz Śniatowski, Paweł Kędzia,
+    Adam Radziszewski, Bartosz Broda
+    Part of the WCCL project
+
+    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 LICENSE and COPYING files for more details.
+*/
+
 #include <boost/test/unit_test.hpp>
 #include <boost/bind.hpp>
 #include <boost/shared_ptr.hpp>
diff --git a/tests/relativeposition.cpp b/tests/relativeposition.cpp
index 0158d1eddb07eafec43614b836a4a9ea242f5402..bbfc85eb0f7cbfb7de0c7e5a2789c54787be6e35 100644
--- a/tests/relativeposition.cpp
+++ b/tests/relativeposition.cpp
@@ -1,3 +1,20 @@
+/*
+    Copyright (C) 2011 Adam Wardyński, Tomasz Śniatowski, Paweł Kędzia,
+    Adam Radziszewski, Bartosz Broda
+    Part of the WCCL project
+
+    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 LICENSE and COPYING files for more details.
+*/
+
 #include <boost/test/unit_test.hpp>
 #include <boost/bind.hpp>
 #include <boost/shared_ptr.hpp>
diff --git a/tests/rules-data/match/remark/cclmatch.xml b/tests/rules-data/match/remark/cclmatch.xml
new file mode 100644
index 0000000000000000000000000000000000000000..25498def4c4f08d429448416989c31e7e70274a0
--- /dev/null
+++ b/tests/rules-data/match/remark/cclmatch.xml
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE cesAna SYSTEM "xcesAnaIPI.dtd">
+<chunkList xmlns:xlink="http://www.w3.org/1999/xlink">
+ <chunk>
+  <sentence>
+   <tok>
+    <orth>Miasto</orth>
+    <lex><base>miasto</base><ctag>noun</ctag></lex>
+    <ann chan="AdjN">0</ann>
+    <ann chan="P" head="1">1</ann>
+   </tok>
+   <tok>
+    <orth>stołeczne</orth>
+    <lex><base>stołeczny</base><ctag>adj</ctag></lex>
+    <ann chan="AdjN" head="1">1</ann>
+    <ann chan="P">0</ann>
+   </tok>
+   <tok>
+    <orth>Warszawa</orth>
+    <lex><base>warszawa</base><ctag>noun</ctag></lex>
+    <ann chan="AdjN">1</ann>
+    <ann chan="P">0</ann>
+   </tok>
+   <tok>
+    <orth>centralna</orth>
+    <lex><base>centralny</base><ctag>adj</ctag></lex>
+    <ann chan="AdjN">0</ann>
+    <ann chan="P">0</ann>
+   </tok>
+   <ns/>
+   <tok>
+    <orth>,</orth>
+    <lex><base>,</base><ctag>interp</ctag></lex>
+    <ann chan="AdjN">0</ann>
+    <ann chan="P">0</ann>
+   </tok>
+   <tok>
+    <orth>nowy</orth>
+    <lex><base>nowy</base><ctag>adj</ctag></lex>
+    <ann chan="AdjN">0</ann>
+    <ann chan="P" head="1">2</ann>
+   </tok>
+   <tok>
+    <orth>wielki</orth>
+    <lex><base>wielki</base><ctag>adj</ctag></lex>
+    <ann chan="AdjN" head="1">2</ann>
+    <ann chan="P">0</ann>
+   </tok>
+   <tok>
+    <orth>Berlin</orth>
+    <lex><base>berlin</base><ctag>noun</ctag></lex>
+    <ann chan="AdjN">2</ann>
+    <ann chan="P">0</ann>
+   </tok>
+   <tok>
+    <orth>Zachodni</orth>
+    <lex><base>zachodni</base><ctag>adj</ctag></lex>
+    <lex><base>zachodny</base><ctag>adj</ctag></lex>
+    <ann chan="AdjN">0</ann>
+    <ann chan="P">0</ann>
+   </tok>
+   <tok>
+    <orth>z</orth>
+    <lex><base>z</base><ctag>other</ctag></lex>
+    <lex><base>z</base><ctag>qub</ctag></lex>
+    <ann chan="AdjN">0</ann>
+    <ann chan="P">0</ann>
+   </tok>
+   <tok>
+    <orth>dzielnicÄ…</orth>
+    <lex><base>dzielnica</base><ctag>noun</ctag></lex>
+    <ann chan="AdjN">0</ann>
+    <ann chan="P">0</ann>
+   </tok>
+   <tok>
+    <orth>tureckÄ…</orth>
+    <lex><base>turecki</base><ctag>adj</ctag></lex>
+    <ann chan="AdjN">0</ann>
+    <ann chan="P">0</ann>
+   </tok>
+   <ns/>
+   <tok>
+    <orth>.</orth>
+    <lex><base>.</base><ctag>interp</ctag></lex>
+    <ann chan="AdjN">0</ann>
+    <ann chan="P">0</ann>
+   </tok>
+  </sentence>
+ </chunk>
+</chunkList>
diff --git a/tests/rules-data/match/remark/cclmatch1.ccl b/tests/rules-data/match/remark/cclmatch1.ccl
new file mode 100644
index 0000000000000000000000000000000000000000..a207bc81a94c82b31fd0aa77de3f57c199e37826
--- /dev/null
+++ b/tests/rules-data/match/remark/cclmatch1.ccl
@@ -0,0 +1,25 @@
+match_rules(
+  apply(
+    match(
+      is("P"),
+      inter(class[0], adj)
+    ),
+    actions(
+      remark( M, "P" )
+    )
+  ) ;
+
+
+  apply(
+    match(
+      inter(base[0], ["zachodni"]),
+      inter(base[0], ["z"]),
+      inter(base[0], ["dzielnica"]),
+      inter(base[0], ["turecki"])
+    ),
+    actions(
+      remark( M, "AdjN" )
+    )
+  )
+
+)
diff --git a/tests/rules-data/match/remark/cclmatch1.out.xml b/tests/rules-data/match/remark/cclmatch1.out.xml
new file mode 100644
index 0000000000000000000000000000000000000000..2f389b0cb810b8d9b1c08bd05161b3868415ba1c
--- /dev/null
+++ b/tests/rules-data/match/remark/cclmatch1.out.xml
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE cesAna SYSTEM "xcesAnaIPI.dtd">
+<chunkList xmlns:xlink="http://www.w3.org/1999/xlink">
+ <chunk>
+  <sentence>
+   <tok>
+    <orth>Miasto</orth>
+    <lex><base>miasto</base><ctag>noun</ctag></lex>
+    <ann chan="AdjN">0</ann>
+    <ann chan="P" head="1">3</ann>
+   </tok>
+   <tok>
+    <orth>stołeczne</orth>
+    <lex><base>stołeczny</base><ctag>adj</ctag></lex>
+    <ann chan="AdjN" head="1">1</ann>
+    <ann chan="P">3</ann>
+   </tok>
+   <tok>
+    <orth>Warszawa</orth>
+    <lex><base>warszawa</base><ctag>noun</ctag></lex>
+    <ann chan="AdjN">1</ann>
+    <ann chan="P">0</ann>
+   </tok>
+   <tok>
+    <orth>centralna</orth>
+    <lex><base>centralny</base><ctag>adj</ctag></lex>
+    <ann chan="AdjN">0</ann>
+    <ann chan="P">0</ann>
+   </tok>
+   <ns/>
+   <tok>
+    <orth>,</orth>
+    <lex><base>,</base><ctag>interp</ctag></lex>
+    <ann chan="AdjN">0</ann>
+    <ann chan="P">0</ann>
+   </tok>
+   <tok>
+    <orth>nowy</orth>
+    <lex><base>nowy</base><ctag>adj</ctag></lex>
+    <ann chan="AdjN">0</ann>
+    <ann chan="P" head="1">1</ann>
+   </tok>
+   <tok>
+    <orth>wielki</orth>
+    <lex><base>wielki</base><ctag>adj</ctag></lex>
+    <ann chan="AdjN" head="1">2</ann>
+    <ann chan="P">1</ann>
+   </tok>
+   <tok>
+    <orth>Berlin</orth>
+    <lex><base>berlin</base><ctag>noun</ctag></lex>
+    <ann chan="AdjN">2</ann>
+    <ann chan="P">0</ann>
+   </tok>
+   <tok>
+    <orth>Zachodni</orth>
+    <lex><base>zachodni</base><ctag>adj</ctag></lex>
+    <lex><base>zachodny</base><ctag>adj</ctag></lex>
+    <ann chan="AdjN" head="1">3</ann>
+    <ann chan="P">0</ann>
+   </tok>
+   <tok>
+    <orth>z</orth>
+    <lex><base>z</base><ctag>other</ctag></lex>
+    <lex><base>z</base><ctag>qub</ctag></lex>
+    <ann chan="AdjN">3</ann>
+    <ann chan="P">0</ann>
+   </tok>
+   <tok>
+    <orth>dzielnicÄ…</orth>
+    <lex><base>dzielnica</base><ctag>noun</ctag></lex>
+    <ann chan="AdjN">3</ann>
+    <ann chan="P">0</ann>
+   </tok>
+   <tok>
+    <orth>tureckÄ…</orth>
+    <lex><base>turecki</base><ctag>adj</ctag></lex>
+    <ann chan="AdjN">3</ann>
+    <ann chan="P">0</ann>
+   </tok>
+   <ns/>
+   <tok>
+    <orth>.</orth>
+    <lex><base>.</base><ctag>interp</ctag></lex>
+    <ann chan="AdjN">0</ann>
+    <ann chan="P">0</ann>
+   </tok>
+  </sentence>
+ </chunk>
+</chunkList>
diff --git a/tests/rules-data/match/remark/simple.is-the-tagset b/tests/rules-data/match/remark/simple.is-the-tagset
new file mode 100644
index 0000000000000000000000000000000000000000..8b137891791fe96927ad78e64b0aad7bded08bdc
--- /dev/null
+++ b/tests/rules-data/match/remark/simple.is-the-tagset
@@ -0,0 +1 @@
+
diff --git a/tests/strsetfunctions.cpp b/tests/strsetfunctions.cpp
index dad977a473b7a411fc401aa70fbda9edc37ac67c..85523302438655da54c93b3f9408f7fd70094043 100644
--- a/tests/strsetfunctions.cpp
+++ b/tests/strsetfunctions.cpp
@@ -1,3 +1,20 @@
+/*
+    Copyright (C) 2011 Adam Wardyński, Tomasz Śniatowski, Paweł Kędzia,
+    Adam Radziszewski, Bartosz Broda
+    Part of the WCCL project
+
+    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 LICENSE and COPYING files for more details.
+*/
+
 #include <boost/test/unit_test.hpp>
 #include <boost/bind.hpp>
 #include <boost/shared_ptr.hpp>
diff --git a/tests/values.cpp b/tests/values.cpp
index 5b23065fe91ca3b3fc7ebaede4059864dea23dcf..3e0a5d087bd56c56b453f4c4357e07a98a48fe66 100644
--- a/tests/values.cpp
+++ b/tests/values.cpp
@@ -1,3 +1,20 @@
+/*
+    Copyright (C) 2011 Adam Wardyński, Tomasz Śniatowski, Paweł Kędzia,
+    Adam Radziszewski, Bartosz Broda
+    Part of the WCCL project
+
+    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 LICENSE and COPYING files for more details.
+*/
+
 #include <boost/test/unit_test.hpp>
 #include <boost/bind.hpp>
 #include <libcorpus2/tagsetmanager.h>
diff --git a/tests/varaccess.cpp b/tests/varaccess.cpp
index e16b42bf415c9ba00d2a0cc0e81db315a204841f..c7c7306ed3c1404f9ad25db1e22af2e4d467c3ec 100644
--- a/tests/varaccess.cpp
+++ b/tests/varaccess.cpp
@@ -1,3 +1,20 @@
+/*
+    Copyright (C) 2011 Adam Wardyński, Tomasz Śniatowski, Paweł Kędzia,
+    Adam Radziszewski, Bartosz Broda
+    Part of the WCCL project
+
+    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 LICENSE and COPYING files for more details.
+*/
+
 #include <boost/test/unit_test.hpp>
 #include <boost/bind.hpp>
 
diff --git a/tests/vargetter.cpp b/tests/vargetter.cpp
index 83ed31f4c030417f547184a71dc4d8bda76fc312..cb95baf05dc46b6b943d5a5305408efe402d8964 100644
--- a/tests/vargetter.cpp
+++ b/tests/vargetter.cpp
@@ -1,3 +1,20 @@
+/*
+    Copyright (C) 2011 Adam Wardyński, Tomasz Śniatowski, Paweł Kędzia,
+    Adam Radziszewski, Bartosz Broda
+    Part of the WCCL project
+
+    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 LICENSE and COPYING files for more details.
+*/
+
 #include <boost/test/unit_test.hpp>
 #include <boost/bind.hpp>
 
diff --git a/tests/variables.cpp b/tests/variables.cpp
index c312955335345325327c7d99330b553eed1f4a52..0e4d51bcb65ac6d64c5707a702044f79b88f6f02 100644
--- a/tests/variables.cpp
+++ b/tests/variables.cpp
@@ -1,3 +1,20 @@
+/*
+    Copyright (C) 2011 Adam Wardyński, Tomasz Śniatowski, Paweł Kędzia,
+    Adam Radziszewski, Bartosz Broda
+    Part of the WCCL project
+
+    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 LICENSE and COPYING files for more details.
+*/
+
 #include <boost/test/unit_test.hpp>
 #include <boost/bind.hpp>
 
diff --git a/tests/varsetter.cpp b/tests/varsetter.cpp
index db508f4041a5c4bc59df4c9d4062a0450cbbcf05..9cdebd34685a9f7f931e4e6f7eb24a17b063f5f0 100644
--- a/tests/varsetter.cpp
+++ b/tests/varsetter.cpp
@@ -1,3 +1,20 @@
+/*
+    Copyright (C) 2011 Adam Wardyński, Tomasz Śniatowski, Paweł Kędzia,
+    Adam Radziszewski, Bartosz Broda
+    Part of the WCCL project
+
+    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 LICENSE and COPYING files for more details.
+*/
+
 #include <boost/test/unit_test.hpp>
 #include <boost/bind.hpp>
 
diff --git a/wccl-apps/CMakeLists.txt b/wccl-apps/CMakeLists.txt
index 9122f0f0891a14c8f8694780b978b5ba83db3363..85550bfd714fce50da42ac615ffdcf8eee19eb89 100644
--- a/wccl-apps/CMakeLists.txt
+++ b/wccl-apps/CMakeLists.txt
@@ -16,6 +16,7 @@ find_package(Loki REQUIRED QUIET)
 set(LIBS ${LIBS} loki)
 
 include_directories(${CMAKE_SOURCE_DIR})
+include_directories(${wccl_BINARY_DIR}/include)
 include_directories(${Boost_INCLUDE_DIR})
 link_directories(${Boost_LIBRARY_DIRS})
 
diff --git a/wccl-apps/stdopts.cpp b/wccl-apps/stdopts.cpp
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..64c3259934d358c96c2009c2e69011c735722461 100644
--- a/wccl-apps/stdopts.cpp
+++ b/wccl-apps/stdopts.cpp
@@ -0,0 +1,17 @@
+/*
+    Copyright (C) 2011 Adam Wardyński, Tomasz Śniatowski, Paweł Kędzia,
+    Adam Radziszewski, Bartosz Broda
+    Part of the WCCL project
+
+    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 LICENSE and COPYING files for more details.
+*/
+
diff --git a/wccl-apps/stdopts.h b/wccl-apps/stdopts.h
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..64c3259934d358c96c2009c2e69011c735722461 100644
--- a/wccl-apps/stdopts.h
+++ b/wccl-apps/stdopts.h
@@ -0,0 +1,17 @@
+/*
+    Copyright (C) 2011 Adam Wardyński, Tomasz Śniatowski, Paweł Kędzia,
+    Adam Radziszewski, Bartosz Broda
+    Part of the WCCL project
+
+    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 LICENSE and COPYING files for more details.
+*/
+
diff --git a/wccl-apps/wccl-features.cpp b/wccl-apps/wccl-features.cpp
index c1e864103787e1514a1d6f8e6fdda6de9bc0b365..f4be3bb0d8017ea15759a9a452f5480610234b56 100644
--- a/wccl-apps/wccl-features.cpp
+++ b/wccl-apps/wccl-features.cpp
@@ -1,3 +1,20 @@
+/*
+    Copyright (C) 2011 Adam Wardyński, Tomasz Śniatowski, Paweł Kędzia,
+    Adam Radziszewski, Bartosz Broda
+    Part of the WCCL project
+
+    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 LICENSE and COPYING files for more details.
+*/
+
 #include <cstdlib>
 #include <cstdio>
 #include <fstream>
@@ -11,6 +28,9 @@
 #include <libwccl/values/tset.h>
 #include <libwccl/values/strset.h>
 
+// not checking for HAVE_VERSION..., no reason for its absence
+#include <libwccl/version.h>
+
 #include <boost/bind.hpp>
 #include <boost/algorithm/string.hpp>
 #include <boost/make_shared.hpp>
@@ -444,6 +464,7 @@ int main(int argc, char** argv)
 			("output-header,H", value(&output_header),
 			 "Output table header")
 			("help,h", "Show help")
+			("version", "print version string")
 			;
 	boost::program_options::variables_map vm;
 	boost::program_options::positional_options_description p;
@@ -468,6 +489,11 @@ int main(int argc, char** argv)
 		return 1;
 	}
 
+	if (vm.count("version")) {
+		std::cout << "wccl-features (libwccl) " << LIBWCCL_VERSION << "\n";
+		return 0;
+	}
+
 	foreach (const std::string& f, files) {
 		if (f == "-") {
 			corpus_stdin = true;
diff --git a/wccl-apps/wccl-parser.cpp b/wccl-apps/wccl-parser.cpp
index 1251246fd613468f550f557f1e5534e662812470..510b78598617b510c5c6fb2981f2e715ff77229f 100644
--- a/wccl-apps/wccl-parser.cpp
+++ b/wccl-apps/wccl-parser.cpp
@@ -1,3 +1,20 @@
+/*
+    Copyright (C) 2011 Adam Wardyński, Tomasz Śniatowski, Paweł Kędzia,
+    Adam Radziszewski, Bartosz Broda
+    Part of the WCCL project
+
+    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 LICENSE and COPYING files for more details.
+*/
+
 #include <cstdlib>
 #include <fstream>
 #include <iomanip>
@@ -7,6 +24,9 @@
 #include <libwccl/parser/Parser.h>
 #include <libcorpus2/tagsetmanager.h>
 
+// not checking for HAVE_VERSION..., no reason for its absence
+#include <libwccl/version.h>
+
 #include <boost/bind.hpp>
 #include <boost/make_shared.hpp>
 #include <boost/program_options.hpp>
@@ -246,6 +266,7 @@ int main(int argc, char** argv)
 			("variables,V", value(&dump_variables)->zero_tokens(),
 			 "Dump variables after running each query\n")
 			("help,h", "Show help")
+			("version", "print version string")
 			;
 	boost::program_options::variables_map vm;
 	boost::program_options::positional_options_description p;
@@ -266,6 +287,11 @@ int main(int argc, char** argv)
 		return 1;
 	}
 
+	if (vm.count("version")) {
+		std::cout << "wccl-parser (libwccl) " << LIBWCCL_VERSION << "\n";
+		return 0;
+	}
+
 	try {
 		const Corpus2::Tagset& tagset = Corpus2::get_named_tagset(tagset_load);
 		boost::shared_ptr<Corpus2::Sentence> sentence;
diff --git a/wccl-apps/wccl-rules.cpp b/wccl-apps/wccl-rules.cpp
index 758f7d9ae1d4eb901b565c1646de35bb6d0170f9..a3977f1646b8eb7d3f8915af6555409b7fbe6fe2 100644
--- a/wccl-apps/wccl-rules.cpp
+++ b/wccl-apps/wccl-rules.cpp
@@ -1,3 +1,20 @@
+/*
+    Copyright (C) 2011 Adam Wardyński, Tomasz Śniatowski, Paweł Kędzia,
+    Adam Radziszewski, Bartosz Broda
+    Part of the WCCL project
+
+    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 LICENSE and COPYING files for more details.
+*/
+
 #include <cstdlib>
 #include <fstream>
 #include <iomanip>
@@ -15,6 +32,9 @@
 #include <libcorpus2/io/reader.h>
 #include <libcorpus2/io/writer.h>
 
+// not checking for HAVE_VERSION..., no reason for its absence
+#include <libwccl/version.h>
+
 namespace {
 	bool quiet = false;
 
@@ -206,6 +226,7 @@ int main(int argc, char** argv)
 			("first-sentence-only,1", value(&opts.first)->zero_tokens(),
 			 "Only process first sentence\n")
 			("help,h", "Show help")
+			("version", "print version string")
 			;
 	boost::program_options::variables_map vm;
 	boost::program_options::positional_options_description p;
@@ -227,6 +248,11 @@ int main(int argc, char** argv)
 		return 1;
 	}
 
+	if (vm.count("version")) {
+		std::cout << "wccl-rules (libwccl) " << LIBWCCL_VERSION << "\n";
+		return 0;
+	}
+
 	foreach (const std::string& f, files) {
 		if (f == "-") {
 			corpus_stdin = true;
diff --git a/wccl-apps/wccl-run.cpp b/wccl-apps/wccl-run.cpp
index 3fa18fbe990b88fb1d6858ccb53751ebf23139b1..3f28ea364f3c7c74d350bb14ea6fa7878eb385b8 100644
--- a/wccl-apps/wccl-run.cpp
+++ b/wccl-apps/wccl-run.cpp
@@ -1,3 +1,20 @@
+/*
+    Copyright (C) 2011 Adam Wardyński, Tomasz Śniatowski, Paweł Kędzia,
+    Adam Radziszewski, Bartosz Broda
+    Part of the WCCL project
+
+    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 LICENSE and COPYING files for more details.
+*/
+
 #include <cstdlib>
 #include <cstdio>
 #include <fstream>
@@ -20,6 +37,9 @@
 #include <antlr/NoViableAltException.hpp>
 #include <antlr/MismatchedTokenException.hpp>
 
+// not checking for HAVE_VERSION..., no reason for its absence
+#include <libwccl/version.h>
+
 namespace {
 	bool quiet = false;
 	bool tabs = false;
@@ -390,6 +410,7 @@ int main(int argc, char** argv)
 			("progress,p", value(&progress)->zero_tokens(),
 			 "Show progress info")
 			("help,h", "Show help")
+			("version", "print version string")
 			;
 	boost::program_options::variables_map vm;
 	boost::program_options::positional_options_description p;
@@ -414,6 +435,11 @@ int main(int argc, char** argv)
 		return 1;
 	}
 
+	if (vm.count("version")) {
+		std::cout << "wccl-run (libwccl) " << LIBWCCL_VERSION << "\n";
+		return 0;
+	}
+
 	foreach (const std::string& f, files) {
 		if (f == "-") {
 			corpus_stdin = true;