Merge branch 'master' of /Users/dmicomrt/PycharmProjects/ptin with conflicts.