Merge branch 'master' into refs-148
implements load method, and modify initialize method refs #148
Merge branch 'refs-148'