Merge pull request #22 from taliascotchbrook/taliabranch

Changes old & new