final fix
finished
Merge pull request #4 from nknol/Fix/Final

[WIP] Fix/Final