Merge pull request #11 from jcrom/master

merge with trunk