Merge pull request #47 from mmattioli/master

Minor Cleanup/Organization