Restrict modelselection + some minor fix
Merge pull request #59 from Saurabh7/modelselfix

Restrict modelselection + some minor fix