Based on the given examples testcases were added, and resolve modified to make them pass while not failing other cases.

Considered fixed with revision [a29e0299a8].

Pushed.

Version bumped to 1.2.5.