* First work done in branch 'dev'
* Second round of work done in 'dev'
Merge branch 'master' into dev
* Final work done in 'dev' branch. It was hard!
* Last minute bug fix