port to 4.10.1. Fixes for #5 and #6. Tested with solr 4.10.1 based indices.