V6.7 - Resolved Github Issues

Resolved #225, #240