Fix for comments. Close #37