Bug fixes, improvements in README and can be packaged