Pull gem refactor to master