fix for register output field (q instead of data) also fix id issue
Merge branch 'master' of https://github.com/bbaumgar/circuits-with-friends