added comments functionality. fixed #115