Merge pull request #1 from tdroesch/master

Test