Merge pull request #3 from bethzilla/working

Working
Merge pull request #5 from bethzilla/master

Merge pull request #3 from bethzilla/working