Revert "issue #12"

This reverts commit 6ffcc3fbb49901174869d6fbcafc357211e92b10.
Merge branch 'Branch_2d05e5bf3e3f36596d9775cce2db78c805e54667'