Final touches for Version 1.0