bugfix
Merge pull request #7 from BillMills/master

bugfix