Merge pull request #1 from heidisoft/master

Pull the latest from the master.
Merge pull request #2 from heidisoft/prod

Merge pull request #1 from heidisoft/master