Syncing up
Merge pull request #13 from sfraise/Spencer

Syncing up