#9 - needs testing
Fixed minor bug