add basic test
add browsing option
fixed merge conflicts