Version 2.0.7 released

Few changes