Add support for target relative path
Update branch to 0.2-dev