Merge pull request #5 from Petrofski/development

Development
merge
Merge pull request #6 from Petrofski/tamo

Tamo
20/10
Merge pull request #7 from Petrofski/tamo

20/10
Boete Observer