merging hetland's changes into master