Merge pull request #7 from harwooja/master