Merge pull request #6 from mariokonrad/master

Please merge to resolve issue #3