Merge pull request #1 from sebastianbergmann/master

test