Development Snapshot

This commit have a some bug.