Pr/13

Not sure why this isn't in PR #13, but here it is.  @benlachman, @buswellj any thoughts?