Merge pull request #5 from brandonforster/master

a
fixed bug
Merge pull request #7 from Colegreen/master

bugfix