Bug fixes
Merge pull request #12 from jrgrafton/master

Bug fixes