versilov Merge pull request #9 from gregwoodward/master …