1.7, Localization support and Merge with master

Added localization support which solves issue #13
and merged with master to include various fixes.