address feedback
#34: support parsing as well