Merge pull request #5 from pmienk/version2

Merge recent master changes into version2