Merge pull request #16 from afilini/cleanup