Merge pull request #17 from MiguelABarbosa/miguel

final changes before mike works on it