Added 0.7 SNAPSHOT support

Working with David Morgantini.