version 0.4, optimize/refactor/new options