Minor refactoring
Minor refactoring
Merge branch 'release/0.3' into develop