updated form
Merge branch 'develop' of github.com:2rk/bop into develop