Merge pull request #1 from tdroesch/master

Test
Merge pull request #2 from dorichan/master

Merge pull request #1 from tdroesch/master