potch Merge pull request #267 from ChristianKohler/master