Initial prototype for #29
Update #29 fix for Opera's in dev features
Update #29 for opera in dev status
Merge opera into development and resolve conflict
Merge branch 'development' into production