Fixed issue #13 , not #12

12 is just a feature being added anyways, also cleaned some comments from it