Merge pull request #33 from jcrom/master

merge with trunk