Merge pull request #27 from ORelio/Indev

Merging changes from Indev for 1.7.0 release
Word fix
Merge pull request #33 from Aragas/patch-1

Indeed. Never noticed.
Merge pull request #34 from ORelio/Indev

Merging changes from Indev for 1.7.1 release
Merge pull request #37 from ORelio/Indev

Merging changes from Indev for 1.7.2 release
Merge pull request #38 from ORelio/master

Import changes from master into Indev