Fixed issue #22 and the fact that there was a syntax error that broke the entire thing