stable version 2

Maker done, bug with iphone5