bug
Merge pull request #6 from sarcast/master

bug