Merge pull request #22 from Dilshani/master

patch 08
patch 09