Merge pull request #17 from pstch/gen-coords

New models for codification