Merge pull request #7 from jtwaleson/master

PEP8ified and added is_running method.