Fixed #35 & fixed #38
Merge branch 'master' of https://github.com/jariz/fairtrade