added comments functionality
merge