put on a branch, actually working
updated
Merge pull request #4 from kemcbride/kelly/working

Kelly/working