dev in progress
Merge branch 'dev' of https://github.com/Lujeni/observer into dev