fixes
Merge pull request #2 from tonyrd/master

fixes