final code
Merge pull request #234 from KodeKracker/master

final code