Merge pull request #1 from goetas/master

Merge pull request test