Merge pull request #3 from samebchase/samuel-devel

Clean ups