code refactered
Merge pull request #75 from asankasanjaya/master

code refactered