Version update after merging pull request #11
Merge with origin master