Merge pull request #7 from NaviNet/dev

Merging to master
Merge pull request #8 from NaviNet/dev

Merge dev into master
Merge branch 'dev'
Merge branch 'master' into gh-pages