Working on the second feature
Fixed a mistake in the first features
Working on the second feature
Merge pull request #2 from AlexThurston/b_feature

Working on the second feature