FTFY
Merge pull request #1 from wsfulmer/master

FTFY