bugfix
Merge branch 'develop' of https://github.com/nahakiole/fredyframework into develop