Update v1.6
Merge pull request #16 from mastro-elfo/master

Update v1.6