Merge pull request #28 from OpenScienceFramework/issue_28

Stop using deprecated tags
Merge branch 'master' into issue_29