git should ignore dist and build dirs
Merge commit 'f17312b' into ver3