Merge pull request #50 from benwaugh/master
drwxr-xr-x - python
drwxr-xr-x - testing