Pulled changes from androwish, integrated as version 1.2.4