Merge pull request #7 from harwooja/master

Merge pull request #4 harwooja/master
Merge pull request #8 from harwooja/Anagh