update
Merge branch 'master' into github
remove .gitignore
Merge branch 'master' into github
add test