Merge pull request #3 from rubinshteyn89/master

Merge pull request #1 from VolkPack/master
Merge pull request #2 from VolkPack/master

Merge pull request #3 from rubinshteyn89/master