Swapped x, y in g(r) to get correct output.
Merge branch 'master' of http://github.com/nkeim/philatracks