Merge pull request #4 from rsiebert/master

merge