Changes and tweaks
Merge pull request #87 from kaustabh/master

Changes and tweaks