rypeck's function
Merge pull request #260 from RyPeck/master

rypeck's function