131012-0214
Merge pull request #6 from philippschumann/Philipp

131012-0214