tree 39b09f2900c3fcfa265af56e8353a4c58a820fca
parent 2de18021fcb11370e9b5a1fbe7dcfd673533a134
parent 49da91c786855228158cb8937c972cd741bd4c79
author Christopher Dunn <cdunn2001@gmail.com> 1504598330 -0500
committer GitHub <noreply@github.com> 1504598330 -0500

Merge pull request #660 from SloCompTech/master

fixes #659
fixes #661