Misc. minor changes
Merge branch 'master' of github.com:ShmuelLevine/Generic_Factory