Merge pull request #4 from cg-/master

Merging pull request with changes we made at meeting 10/19
Merge remote-tracking branch 'upstream/master'