Some changes for Issue 14

As per Issue #14, some changes addressing the feedback from Berlin. :)