Merge pull request #102 from jbatte47/meta/issue-80-dev

Meta/issue-80-dev
Issue #62 - WIP