Merge pull request #30 from sqmk/master

Pull from master
Merge pull request #31 from sqmk/develop

Merge pull request #30 from sqmk/master