Mymaster

Please, make a review for proposed commits (especially last one)