Merge pull request #2 from cordoval/master

[Ready] cleanups and fixes
switch input -> start and output -> finish