cfulnecky's contribution
Merge pull request #3 from cmelion/master

cfulnecky's contribution