- print opts bug fixed
- merging changes