Merge pull request #230 from AndrzejKurek/remove-double-underscore

Remove double underscores from macro and add a check for it