More basic methods.
Merge branch 'master' of https://github.com/gaj67/gaj-tools.git
Fixed other models.