Merge of #362 and #365 to master