Merge branch 'dev'

Merging with master branch
Updated HISTORY.md
Updated documentation
Updated HISTORY.md
Merging master minor fixes