aghiles Merge pull request #4 from danieldresser/working