fixes
Merge pull request #3 from alexbilbie/master

fixes