Full Localization

finished up the localization function
Merge pull request #36 from oneski/master

Full Localization