Merge pull request #30 from sqmk/master

Pull from master