fixes
Merge pull request #4 from alexbilbie/master

fixes