Added functionality and implemented an OOP approach (that looks nicer)
Updated README