Merge pull request #1 from heidisoft/master

Pull the latest from the master.