Version 1.0
smaller changes
smaller changes
add gitignore
Merge branch 'master' into gh-pages