merge with master
Merge pull request #1 from steamhammer/'dev'

merge with master