Testing works
Merge pull request #19 from mLuby/dev

Looks good - see comment above.