Fix for #4
Feature #8 is done
Merge branch 'feature/0.0.3-get' into develop