Acro pwint master

Marged file of acro-pwint : issues #12.