addresses #94 

These over all but iOS at this PR .  Test well on HTC One and a Galaxy 2