Merge pull request #1 from depinav/master

update
Merge pull request #2 from Tyler-Kujawa/master

pull request