Merge branch 'milad-master'
Tweaked README.
Merge branch 'working'
Merge remote-tracking branch 'forkOrigin/master'