added something to todo
added something to readme
fixed bugs
Merge branch 'development1'