Improved file handling
Merge branch 'master' of github.com:sparks/rter