merge
Merge branch 'master' into gh-pages
Merge pull request #1 from quattromani/master

Master
Merge pull request #2 from quattromani/master

fixed MD issue in README
Merge pull request #3 from quattromani/master

fixed MD in README
Merge pull request #4 from quattromani/gh-pages

Merge gh-pages and master