Merged tema1 master: master now follows actual development