refactoring & new features
updated README