Merge pull request #45 from bhattigurjot/master

corrects saving of entities and indentation