Add simple router mechanism, close #2