Merge pull request #6 from bsedat/merge-v92

Merge v92