Merge pull request #1 from Demenza/master

Pull me
Merge pull request #2 from Demenza/development

Merge pull request #1 from Demenza/master