did i do this right
Merge pull request #27 from gcreamer3/master

did i do this right