Merging master to dev

Dev is behind of master. This merge will update dev to 0.6.0-SNAPSHOT (current master version)