Ver 0 2

Merging Ver 0.2