Nick below the pick and other refactoring of the code
Merge pull request #19 from ersuniljoshi/gh-pages

Nick below the pick and other refactoring and cosmetic issues.