Merge branch 'release/0.1'
Merge branch 'release/0.2'
* Fixed an issue causing the daemon process not to shutdown properly

Signed-off-by: Daniel Marius Bub <daniel.bub@thebub.net>
Merge branch 'hotfix/0.2.1' into develop