add author and date information
Merge branch 'devel'