updated for jackrabbit
updated
Merge branch 'refs/heads/rmzamora-master'