Set of small changes
Merge pull request #32 from kkasunperera/master

Set of small changes