Master: Improvements
Master: add new functionallity