Fixed Comments Creation. Closes #11