Multiple fixes
Merge pull request #474 from monishdeb/multipleFixes

Multiple fixes