Merge pull request #4 from wagnert/master

diff reviewed