Issue #17 -- accomodate ajax calls