Temporary fix to address issue #156. Also changed routing paths. This fi...

...x should expire 2013-10-31.