Merge pull request #1 from shownotes/master

update
Merge pull request #2 from shownotes/master

update
update (#r, #s)
[OSF.php](https://github.com/SimonWaldherr/OSF.php)
Merge branch 'master' of https://github.com/SimonWaldherr/OSF-in-a-Nutshell
Merge branch 'master' into gh-pages