Refactored
Updated README
Screenshot