Merge pull request #13 from SGover/master

a