fixed merge lattice warnings
Merge branch 'master' of https://github.com/lindstroem/TAPY
fixed merge lattice warnings