closes #115
Merge branch 'sourcefile'