new development release
updated from master