fix #4, #10 Adding solr integration.