V3.1- Resolved Github Issues

Resolved #37, #38, #39
Ok, thats fine. thanks