Merge tag '0.1.3' into develop

Bumped to 0.1.3 0.1.3
Resolve with type and locator
Bumped to 0.1.4
Merge branch 'release/0.1.4'