Merge pull request #51 from ffrensch/master

some renamings
maximum fixed for mm
Merge remote-tracking branch 'upstream/master'