Fixing some merge issues. Issue #9 complete.