Debugged classes and added a few small features, nothing major
Updated README file