Merge pull request #2 from janm399/master

Last forgotten commit