Refactored for XML
Fix for optional extraction
Updated version number
Merge branch 'master' into scala-2.11

Conflicts:
	project/project.scala
	src/macros.scala