Add support for ACTION

Before and after: http://with-you.pw/6I4Z