Merged A* code

Fixes #44