Merge pull request #27 from cdau/master

34+35+36 Angabe