tidy up
Merge pull request #45 from rizarsyi/master

tidy up