v0.2 Added options