Merge pull request #100 from SupunS/master

refactor codes
Merge remote-tracking branch 'upstream/master'