finalized merge no X
Merge pull request #12 from Bummel/develop

AutoToto