Merge pull request #2 from porterjamesj/master

Fix #1.
Merge pull request #3 from porterjamesj/master

large refactor + tests - Merging.
Bugfix

's' characters were being removed from node labels during parsing