Akkadius Merge pull request #552 from stheno/web_interface