copyright notices added (#5)
Merge branch 'bug_5' into stable