- bugs fixed
#27