Added support for comments

This closes #3