Merge pull request #3 from woss/master

Merge branch 'dev'
Merge pull request #4 from woss/dev

Merge pull request #3 from woss/master