Fixed #13
Fixed #14
Project 2 classes
Merge pull request #2 from nicklondhe/master

Project two pull