Merge pull request #1 from taykey/master

Merge fork
Merge remote-tracking branch 'upstream/master'