0.3.6: bug fixed, add comments

ready for shipping