Modified codes
Merge pull request #30 from SupunS/master

Modified codes