Merge pull request #12 from jupitermoney/upstream