Merge branch 'master' of github.com:quizzingbricks/quizzingbricks-core
small fixes
Merge pull request #138 from Gurr3/master

small fixes and a merge