NTheEndAgain - Update v0.1.2 - Some fixes + Closes #19, fixes #21