Merge pull request #29 from jcrom/master

merge with trunk