Development to master merge.

Do not forget to use breaks in each case statement.