Merge pull request #104 from Northcode/dev

Dev
Merge pull request #106 from Northcode/dev

Dev
fixed crash at startup
merge with dev-A2