New branch
Added extra feature

#sandheden
Fixed bug
Further bugfixes