Merge pull request #12 from sils1297/master

Bugfix