Refactor to OOP, add wait option, 0.3.0