Fixed issue #8
Fixed issue #9
Merge branch 'master' of github.com:ActiveJpa/activejpa