- Fixed bug wrt load() missing argument
Merge branch 'master' into dev-tommy