Merge branch 'release-0.3.5' into develop
Put preprocess function in place to deal with substitutions.
Merge branch 'feature-preprocess' into develop
Bumped version to 0.3.6 and added note about preprocess to documentation. Issues-wise, this should close #29.
Merge branch 'release-0.3.6'