synchronization with beta branch
repackaging
comment for new option
code cleanup: synchronization with beta branch