Added comments, small cleaning up
Merge pull request #6 from stedes/master

Added comments, small cleaning up