Changed glob syntax
Version 0.6.4
Merge branch 'v0.6'