fixing issues
Merge branch 'pubudu91-master'