Merge pull request #1 from mopp/support_otp21

Support Erlang/OTP 21