Merge pull request #6 from mcifelli/master

pull
Merge pull request #3 from CS320/master

pull