Added new version for testing
Merge branch 'master' into jekyllbased