Merging of 0.9.2 code

Pulling the new changes to the master branch