Merge pull request #1 from ciphero/master

pull request finally
Merge remote-tracking branch 'upstream/master'