Merge pull request #16 from regneq/master

merge