Changed to single source file
Merge branch 'master' of https://github.com/willemt/rsttst