change updatebookmark function to handle token better
get html links, map get tags over
Merge pull request #5 from bitfl1pper/archi

Archi 4