Merge pull request #120 from Northcode/dev

p
finishing
Merge pull request #122 from Northcode/dev-Jens

Dev jens