merge seewasser.py from master into web