Merge pull request #1 from pfriedrich/alpha2

Alpha2
Merge https://github.com/pfriedrich/optimizer into alpha2