manual commit of all the suggested changes by @wouterbruijning see also
#3
Merge pull request #4 from ColdTrick/elgg_1.8

manual commit of all the suggested changes by @wouterbruijning