Merge/54

Merging #54 and resolving conflicts. Using PR for definitive diff and logging.