bug fix
Merge pull request #1 from Skarm/master

bug fix