refactoring, test fix
0.5.2 release
Merge branch 'master' into psi-export