browse cleanup
comment
merge conflicts
Merge pull request #24 from mwernimont/master

browse cleanup