Jira 1

Please bring test2.txt into master!