done 6,11 in Yehiels page. next  - 18,19
 before merging with ofir
merged with ofir 18/12/2013 1:38
Merge pull request #4 from vandervidi/master

done 6,11 in Yehiels page. next  - 18,19