Fixes #4 - issues with camel casing where unnecessary