Syncing up
Merge pull request #14 from sfraise/Spencer

Syncing up