make model registration explicit to prevent missed model registration
Attempt merge with upstream
Adapt to upstream changes
Merge pull request #4 from ImaginationForPeople/master

latest from ifp