Working on #107
Merge branch 'master' of github.com:mvukov/acado