Bug fixes and simplify code
Update version in README