uncommitted changes of last version
Merge upstream:master and updated visual styles