improve calculated question import
Merge pull request #59 from maneframe/calc_data

improve calculated question import