Addressing Issue 4

@silvolu, please review.