Merge pull request #24 from rexington/isimpledev-7oct

iSimple dev Oct 7