[Fixed #30]