Merge pull request #23 from mkaluza/liveopp

Liveopp improvements

Thanks @mkaluza