Merge pull request #1 from mogui/master

Pull changes for version v1.2