July 15, 2018

Fixing bugs