Merge pull request #47 from AdenFlorian/dev

Fix #46 and fixes bug when starting app