Merge pull request #19 from jcrom/master

merge with trunk