merge commit
resolved merge conflict
Merge pull request #40 from MiguelABarbosa/mike

Mike