Cleaned up code and converted to Grunt build process
Updated version