v.2.0.0 fully refactored, new features added