push to desktop
bug fix
merge with master