FIX #5

Resolve strategy
Update changelog
0.1.2