Made webapp-compatible (Fixes #7)