Merge pull request #1 from rfuhrer/master

!!1