--- a/pycolib/ansicolor.py	Mon Aug 19 14:17:09 2013 +0200
+++ b/pycolib/ansicolor.py	Mon Aug 19 14:18:26 2013 +0200
@@ -1,28 +1,42 @@
 # -*- coding: utf-8 -*-
 
-(BLACK, RED, GREEN, YELLOW, BLUE, MAGENTA, CYAN, WHITE, BOLD) = range(0,9)
+# support Python 2.6+
+from __future__ import print_function
+
 
-names = ['black','red','green','yellow','blue','magenta','cyan','white']
+#: Set disabled = True to disable all colors.
+disabled = False
+
 
-disabled = False  # set True to disable all colors
+#: Supported colors as enum and string names.
+(BLACK, RED, GREEN, YELLOW, BLUE, MAGENTA, CYAN, WHITE, BOLD) = range(0,9)
+names = ['black','red','green','yellow','blue','magenta','cyan','white','bold']
+
 
 def highlight(enable, fg=None, bg=None):
-    '''
+    """Return ANSI escape code for selected color and font style.
+
+    Set `enable` to true value to enable highlighting, false to disable/end highlighting.
+
+    Set color and style using `fg` and `bg`. These parameters will accept
+    string or variables defined in this module (BLACK, ...).
 
-    highlight(1) -- switch to bold, keep previous color
-    highlight(1, RED) -- red foreground
-    highlight(1, BOLD + YELLOW, BLUE) -- yellow on blue, bold
-    highlight(0) -- reset
+    Usage example::
 
-    '''
+        highlight(1) -- switch to bold, keep previous color
+        highlight(1, 'bold red') -- bold red foreground
+        highlight(1, BOLD | YELLOW, BLUE) -- yellow on blue, bold
+        highlight(0) -- reset
+
+    """
     global disabled
     if disabled:
         return ''
 
     if isinstance(fg, str):
-        fg = names.index(fg)
+        fg = sum(names.index(item.lower()) for item in fg.split())
     if isinstance(bg, str):
-        bg = names.index(bg)
+        bg = sum(names.index(item.lower()) for item in bg.split())
 
     if enable:
         code = '1'
@@ -42,6 +56,22 @@
     else:
         return "\033[0m"
 
-def set_highlight(enable, fg=None, bg=None):
-    print(highlight(enable, fg, bg), end='')
+
+def hprint(*args, **kwargs):
+    """Highlighted print.
+
+    Usage is same as for print function.
+    Whole output is colored as specified by `fg`, `bg` parameters.
+
+    Usage example::
 
+        hprint('Hello in red!', fg='bold red')
+
+    """
+    fg = kwargs.pop('fg', None)
+    bg = kwargs.pop('bg', None)
+    end = kwargs.pop('end', '\n')
+    print(highlight(1, fg, bg), end='')
+    print(*args, end='', **kwargs)
+    print(highlight(0), end=end)
+