Merge pull request #106 from pmienk/version2

Merge recent develop changes into version2