Merge master

Merged master branch to incorporate changed made in #187.