Merge pull request #97 from SGover/master

merge