Merge pull request #29 from gshaw/master