Merge branch 'dev'

* dev:
  damn typo
Merge pull request #3 from woss/master

Merge branch 'dev'