Merge pull request #17 from schlexer/master

Introduced transition state and input functionality

Author: kirstenwinther