Merge pull request #79 from Northcode/dev

Dev
Merge pull request #81 from Northcode/dev

Dev
gitignore fix
Merge pull request #82 from Northcode/dev-Andreas

Dev andreas