Merge pull request #23 from jcrom/master

merge with trunk