Merge pull request #16 from MiguelABarbosa/jeff

Jeff
final changes before mike works on it
Merge pull request #17 from MiguelABarbosa/miguel

final changes before mike works on it