Fixed #77
Fixed #76
Merge branch 'master' of github.com:acado/acado