Merge pull request #10 from cfwheels/new-master

pull from upstream
Merge pull request #12 from scahyono/upstream

pull from Upstream
repair ORA-00918: column ambiguously defined
Merge pull request #235 from scahyono/bugfix

repair Oracle - test failures #187