Syncing up
Merge pull request #15 from sfraise/Spencer

Syncing up