New version with utm stuff
Merge pull request #2 from borski/master

UTM stuff