fixed issue #29
merged diffs
updated readme