Samuell3 master

Caipei`s branch rebase