[Issue #14] One-upping @lmarburger