Spring 2018

Issue #7