Commit 7bbb13ea593832bc931e72cf58bc6fbd7b6b2d3e

Brandon Schaefer 2017-03-01T14:50:59

* Some refactoring and bug fixes. Thanks Micha? Kuchta!