Merge pull request #8 from jcchin/master

updated milestones
deliverable stuff