Merge pull request #4 from rlindner/master

Merge pull request #4