add changes from 2014-04-03
Merge pull request #22 from sebastiankliem/master

add changes from 2014-04-03