Fixes issues 148

This patch has fix for the issue #148. It's based on patches for build option reorganization and documentation changes.