Applied changes for version 0.8.0
Applied changes for version 0.8.1