Merge pull request #3 from jklepp-tgm/master