Merge pull request #6 from RandyKahle/develop

First set of tasks ported from Randy Kahle's plugin