Readying for 1.0. Resolves #45 and #46
Fix conflict.