pulls 358 and 361

[Claude Warren]

These pulls have conflicting changes.  When one is merged I will fix the
other.
Claude

-- 
I like: Like Like - The likeliest place on the web
<http://like-like.xenei.com>
LinkedIn: http://www.linkedin.com/in/claudewarren