bug fixed in v1.1
resolve merge conflict
added notes for completing