Finally merging in development branch