Merge branch 'release/0.3.1' into develop
include inline to fix variable includes bug
bumped version
Merge branch 'release/0.3.2'