Bug fixes
Merge pull request #226 from jaredbischof/master

Bug fixes