Merge pull request #4 harwooja/master