final code
Merge pull request #119 from KasenJ/master

final code