regex fix
added model wants to TODO
Merge branch 'dev/master' of github.com:ConnectAi/cornerstone into dev/master