merge in development WIP:
"Merge pull request #113 from jaeggerr/development"