Merge pull request #1 from salzinger/master

test