Fork of 0.3.1-SNAPSHOT from code.google.com SVN master branch