commit 22/09/2014
commit 23/09/2014 done point 11
commit 23/09/2014 done point 11 part2