Merge pull request #1 from zenoio/master

All of ben's changes over night.
Plan changes 0.1

First Test
Merge pull request #31 from Jshifter/master

Plan Changes 0.1