Merge pull request #293 from pgreyson/master

Bug fixes