Changed initial version to 0.1 and updated options