Merge pull request #178 from sodabrew/rebase_pr177