Merge pull request #125 from Northcode/dev

hey there
Finishing up setup
Merge pull request #126 from Northcode/dev-Jens

Setup