Comments fixed #99 and tested