Revert "Merge pull request #15 from ExproSoft/Ver5"

This reverts commit 6ca18f2d265bee503d315628d321b8a29cbede72, reversing
changes made to 5d137377d72d6b53ef9dd1e4557ee9cdaba902b1.