Final commit of the Plan

Version 0.4