fixed a possible bug with convert
removed
Merge branch 'master' of https://github.com/reedessick/nmodelte

some local modifications and a lot of work elsewhere
merged with master