Merge pull request #1 from JoshuaEstes/master

A few ideas