Merge pull request #1 from omedjaouri/master

1/30/2013 -[14:12]
Refactoring, recommenting

And removing extraneous code.