Resolved Github Issues

Resolved #37, #38, #39