Merge pull request #1 from davidensinger/master

Several small updates to project
Adding check for jcr_root folder

adds a bit of backward compatibility