plan changes 0.4
Merge pull request #36 from Jshifter/master

plan changes 0.4