Clean up functions; add functionality to bookmark files
Merge pull request #8 from jsks/master

Clean up functions; add functionality to bookmark files