Updated dev-master version