Merged bug3 into master
added f12
Merge branch 'master' into stable