Merge pull request #62 from Northcode/dev

Dev
almost there!
Merge pull request #65 from Northcode/dev-Andreas

Dev andreas