2014-07-23 commit fromlaptop