more functions = more fun!
Merge pull request #154 from ryanpcmcquen/master

more functions = more fun!