Merge pull request #30 from actorquedeveloper/master

4.2.0 code freeze
Merge pull request #3 from adaptivecomputing/master

Sync up.