Closes #23, and put #22 into web interface