minor fixes
Merge branch 'master' into vivek
minor styling
Merge pull request #14 from vivekmshah/vivek

Vivek