Version 0.2 with new options