from tar ball init branch 1.6.0.0
Merge pull request #1 from baoboa/master

from tar ball init branch 1.6.0.0