commit
Merge pull request #234 from SatishTalim/master

commit - minor
commit
Merge pull request #235 from SatishTalim/master

commit - minor
Merge branch 'development'
Merge branch 'master' into gh-pages