proposed fix for Issue #57
update copyright notices
proposed fix for Issue #58
Merge branch 'dev'