Resolve with type and locator
Bumped to 0.1.4
Merge branch 'release/0.1.4'
Merge tag '0.1.4' into develop

Resolve with locator and type