Manually merged PR #3
Upgraded to OrientDB 2.0-SNAPSHOT