Fixed bugs and added new features
Fix readme merge