fix #220
Merge branch 'master' into 48hrTrial