Merge pull request #28 from fredcallaway/master

fix system object
fix data structure