Resume Done.
Merge branch 'dev' of github.com:blm021/jokket into dev