AppEngine-deployable
AppEngine-deployable
Merge AppEngine with working version from Andreas.