Merge branch 'development' for tagging of 0.7.0