Merge pull request #48 from danh-arm/dh/major-refactoring
danh-arm authored
dh/major refactoring
408c3768