andrewsmedina Merge pull request #11 from maparent/master