bugfix v.1.1 for production
Resolved merge conflict
added notes to completion