Applied changes for version 0.8.2