diff --git a/src/Crummy/Phlack/Message/Message.php b/src/Crummy/Phlack/Message/Message.php
index <HASH>..<HASH> 100644
--- a/src/Crummy/Phlack/Message/Message.php
+++ b/src/Crummy/Phlack/Message/Message.php
@@ -41,7 +41,7 @@ class Message extends Partial implements MessageInterface
 
         $resolver->setNormalizers([
             'channel' => function (Options $options, $value) {
-                return empty($value) ? $value : (0 === strpos($value, '#') ? $value : '#' . $value);
+                return empty($value) ? $value : (0 === strpos($value, '#') ? $value : (0 === strpos($value, '@') ? $value : '#' . $value));
             },
             'icon_emoji' => function(Options $options, $value) {
                 return empty($value) ? $value : sprintf(':%s:', trim($value, ':'));
@@ -66,7 +66,7 @@ class Message extends Partial implements MessageInterface
     public function setChannel($channel)
     {
         if (!empty($channel)) {
-            $this->data['channel'] = (0 === strpos($channel, '#') ? $channel : '#' . $channel);
+            $this->data['channel'] = (0 === strpos($channel, '#') ? $channel : (0 === strpos($channel, '@') ? $channel : '#' . $channel));
         }
         return $this;
     }
Extend setChannel: sending direct message
- Added check if channel name starts with @ then send it as direct message to user

Extend setChannel: sending direct message
- Updated setDefaultOptions method to allow sending direct message