Merge branch 'master' of github.com:raamdev/independent-publisher