Refactors, fix, and features#15

sgerbino merged 1 commit intocppalliance:developcppalliance/corosio:developfrom

sgerbino:pr/refactorsgerbino/corosio:pr/refactorCopy head branch name to clipboard