merge testings
new files
Merge branch 'master' into v1.0.3