Merge pull request #143 from joaoventura/master

Added docstrings, comments, and 'pythonized' the code a little