Merge pull request #24 from jcrom/master

merge with trunk