Bug fix 2
Beta
Beta
Merge pull request #6 from Apyr/master

Done