Merge pull request #20 from phdd/develop

GNU Lesser General Public License 2.1