Merge pull request #9 from godfat/godfat

Bunch of changes from the awesome @godfat