functional
Merge pull request #84 from ryanbahniuk/circle-timeout

functional