Resolved Github Issues

Resolved #114, #118, #119, #120