Worked out the location parsing issue...Fixes #38