Merge pull request #133 from ridoo/master

prepare for next development phase
Merge remote-tracking branch 'eike/develop'