#14 some changes
Merge branch 'develop' of https://github.com/qmule/qmule into develop