Changed to dev-master where several bugs are fixed