Some updates
1.0-alpha-2