Pull request

Not sure what to enter here. But here is a pull request to merge contributions from BluePrairie and me.

/Stefan