[Fixed #73] Issues #16 and #72