Typo fixed
Router reimplemented (#16)