Merge pull request #13 from Northcode/dev

Dev
changed stuff to static
Merge pull request #14 from Northcode/dev-Andreas

Dev andreas