Syncing up
Merge pull request #11 from sfraise/Spencer

Syncing up