Fixed issue #5 - thanks to @rosstimson for providing the 
feedback