Fixed bug #94. Implemented infrastucture for the localization.
Merge remote-tracking branch 'origin/master' into 0.9