Merge pull request #9 from brianjmiller/master

Bug fix