Merge pull request #2 from woss/master

Merge pull request #1 from woss/develop
damn typo
Merge branch 'dev'

* dev:
  damn typo