Merge latest from dev branch to master branch #93

Closed mmundy42 closed 9 years ago