Merge pull request !5 from Amdi/master
Merge pull request !3 from Amdi/master
Merge pull request !1 from Amdi/master