Merge pull request #1 from AlexanderKurtz/master

Pull request for the patches I consider stable