Fixed infinite loop. doh!
Merge pull request #9 from steveHaar/Development

Fixed infinite loop. doh!