ver. 0.3.2, refactoring, more options, defaults, minor edits