Fixed #43 (@todo: add JSON support back post launch)