Merge pull request #241 from mochi/rebar3