Merge pull request #20 from jcrom/master

merge with trunk