bug fix. v1.1 for production
resolve merge conflict
added notes completed coding