Bumped version
Updated code conventions to not use _ variables, fixed whitespace, resolved backwards compat issues