A fork from SoloApp (http://www.getsoloapp.com) to fix some bugs