Merge pull request #3 from mhartl/master

thanks