Fix partially issue #167, just need to fix the links