New changes by Kris
Merge pull request #19 from jimaek/dmitriy

New changes by Kris