Blocking waitKey for development
Merge branch 'waitkey' into beta