Updates to v4.0
Having trouble merging from origin/v4.0 to local
Merge pull request #142 from upsonp/v4.0

V4.0