bug fix in progress
bug fixed
Merge pull request #19 from iOiurson/master

Clean version