merged dave and my version
updated readme
merged testbranch