Fixed Issue #13
Possible solution for Issue #5, Will close it if I don't get the error again before release of 0.02