Amitai Efrati

@yosriz , @berryve I took care of some things the you commented and I added some comments on your comments.

@yosriz I updated the code so it will not include what we talked about. Also, merge from master. Please take a look.