bug fixed v1.1 for production
resolve merger conflict
added notes completed coding