Added full functionality and updated README