Changed Groovy Version to 2.0.8
Bug fixes and minor refactoring