Fix for bug ocombe#18: merged files and incorrect module loading
typo
update changelog
Added a changelog