Merge pull request #9 from cdmcnamara/base-impl

Base impl
[FIX] Bumped one version up from master
Merge remote-tracking branch 'upstream/develop' into base-impl