More Cleanup
Merge pull request #1 from bstorck/dev

More Cleanup