refactoring
Merge branch 'develop' of github.com:svbergerem/fefebot