Chings branch

Please pull/add this to the master branch. This is the current working/newest version. Thanks! 

Ching