new commit by tim
Merge pull request #1 from howsyourface/timsChanges

new commit by tim