notes completed -> facebox error not fixed
Merge origin/master