Merge pull request #34 from brianjmiller/master

Bug fix