Resolved Github Issues

Resolved #307, #324