Bug fixes
Merge pull request #105 from mbeall/master

Bug fixes