Merge pull request #3 from bethzilla/working

Working