Merge pull request #817 from mcmonkey4eva/master

Pull request for dLocation functionality