Merge pull request #67 from Northcode/dev

Dev
FAK
Merge pull request #69 from Northcode/dev-Andreas

Dev andreas