Moved localization, closes #51