Modifications based on Wayne doc
Merge pull request #5 from jimaek/jim

Modifications based on Wayne doc