Added classpath* for context resolution, fixed Env issues and other minor improvements
Merge remote-tracking branch 'origin/master'