Fixed #11 , frontend tested on iPad