Applied changes for version 0.7.2