Changing parallelism scheme.
Merge pull request #27 from mhdbny/develop

Changing parallelism scheme.
Revised pull request and fixed other bugs.
Merge pull request #28 from MatthewGerber/develop

Merge new parallelism scheme and some other fixes.