Merge pull request #26 from jcrom/master

merge with trunk