Implements and closes #124