Merge pull request #18 from stuforbes/version-2

pattern matching tidy up
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/version-2'
Merge remote-tracking branch 'origin/master'
Fixing build path issues