Adding fixes for CEP-912 and CEP-915
Merge pull request #27 from gokulbs/master

Fixes for CEP-912 and CEP-915