Merge pull request #27 from limianwang/master

Update Elastic Search Indices as well as schema toJSON