#10 - Implement target support - Close #10