Merge pull request #3 from woss/master

Merge branch 'dev'