Moved two functions from comments to discourse

(so they don't get defined twice)
Merge pull request #19 from nicksahler/master

Moved functions