* Finished https://github.com/scbd/gaia/issues/34 and https://github.com/scbd/gaia/issues/35