Merge pull request #21 from Tophans/master

Final
BugFix