Merge branch 'release/0.0.17' into develop
add timestamps to files
Merge branch 'release/0.1.0'