Removed redundant bookmark file checks
Merge branch 'master' into issue5