plan changes 0.21
Merge pull request #34 from Jshifter/master

plan changes 0.21