Incorporated some of @rBatt suggestions and removed some extra comments. Fixes #10