- minor improvs
Merge pull request #463 from afabiani/c015

 - minor improvs