Merge pull request #30 from SupunS/master

Modified codes
megrged
Merge remote-tracking branch 'upstream/master'