Fixed the bug with a hacky fix!
Merge pull request #123 from Jtfinlay/fixes

IAMA God AMA