Small changes to 7 and 12, added placeholder for 15
Merge pull request #34 from johnbfair/master

Small changes to 7 and 12, added placeholder for 15