New location proposal
Merge pull request #237 from computeranonymous/flowerhack/location-proposal

New location proposal