Fixes issues #4, #5, #6
Fix
Merge pull request #7 from alexandru/version-4

Version 4