Support for Json files as well (close #51)