Fix&enhancement for issue #3

Misses the "default list" feature though.
Much [DRY](http://en.wikipedia.org/wiki/Don't_repeat_yourself)er code but should still be improved. The original code was insane!

// Failed to get [hub](https://github.com/defunkt/hub) attach the pull-request to issue #3. Sorry