Fix for Issue #4

Sorry for the multiple commits, my formatting skills definitely need an upgrade ;)