Bug fixes
Merge pull request #1 from timothyej/master

Bug fixes