Merge pull request #107 from ylevitsk/master

6/9 3:19pm
testing