Merge pull request #12 from glenwks/master

Pull Request 17/1
Merge remote-tracking branch 'genshyft/master'