Merge pull request #11 from RusticiSoftware/master

Initial framework and significant chunk of coverage