Dom and Carly changes
Merge pull request #61 from cchan5/master

Dom and Carly changes