Updated to 0.5.3
Updated to 0.5.4
Updated to 0.5.4
Fixed conflict
Merge tag '0.5.4' into develop

bug fix on glob