bug fixed for v 1.1
resolve merge conflicts
added notes , completed coding