Merge pull request #326 from pgreyson/master

Bug fixes