Merge branch 'mdejong-master'
updated the email address in copyright statements
tagging 0.5.5 release