Iss#2 completed

Issue #2 completed. Parser operating as expected. All tests passing.