Split out parsing functions
Update docs
Merge branch 'release/0.0.3' into develop