Resolved Github Issues

Resolved #322, #323