Merged to version 9.2

Full update to 9.2 and some additonial improvements.
Merge pull request #32 from Altrec/patch-1

Merged to version 9.2