Merge branch 'release/0.2.0' into develop
Fix make shortcuts
Fixed render_to_string error
Merge branch 'release/0.2.1'