merge last dev version into master