Don't hard-code variable size.
Merge branch 'develop' of github.com:jhh/onkyokit into develop