Fixes for issues reported by Jas
Merge branch 'develop' of github.com:yogeshchaugule/lpc into develop