fixing build erros
Merge pull request #2 from rswijesena/master

fixing build erros - Changes by Roshan