corrected multiplication factor in
minor changes
Merge branch 'basetest'