Merge pull request #320 from astern7/master

Several changes in BIUTEE