V7.7-Resolved Github Issues 

Resolved #322, #323