walde-wip

Please merge my work to master branch