Syncing up
Merge pull request #12 from sfraise/Spencer

Syncing up