Original commit.
Merge branch 'master' of https://github.com/ganast/cvxmltools
Merged stuff from origin/master.