Added OptLocation
Merge pull request #13 from stephenmac7/master

Added OptLocation