Adding wave and TimeLimit.
Merge branch 'master' of https://github.com/rytmrt/FijiFall