HeahDude Merge pull request #102 from Exercise/sf-7