Merge pull request #33 from actorquedeveloper/master

Daily Sync
Merge pull request #36 from actorquedeveloper/master

Sync
Merge pull request #6 from adaptivecomputing/master

Sync