Modifications for 1.0.4
Merge branch 'master' into scala-2.10
Lightweight extractors
Removed serialization/extraction
Merge branch 'master' into scala-2.10