Minor cleanup/enhancements
Merge pull request #73 from abhijeetkpawar/develop

Minor cleanup/enhancements