change 1
Merge pull request #1 from slitsch/master

change 1