Updated to 1.0 format
Merge pull request #2 from daylightstudio/master

Updated to 1.0 format