Chris branch

Please take a look at the proposal. make changes if you want and merge it to the master branch. Please let me know whether or not if I can submit it on Vista or not.

Thanks,
Chris