Issue #2 patch

@pdaian I hope this is what you wanted for Issue #2