fixed #8 ps+1
Merge branch 'iss-8'