Merge pull request #49 from Northcode/dev

Dev
FAKING SUO
this didn't really work
merge with dev
Merge pull request #53 from Northcode/dev-Andreas

Dev andreas