Fixed Reported Issues with Pull Request #147, continuation from #143

Alright, I fixed the requested issues with my previous pull request.