Version update
Added 1.0.4 changes
Merge branch 'master' into scala-2.10
Lightweight extraction
Removed extraction/serialization
Merge branch 'master' into scala-2.10