Merge pull request #27 from jcrom/master

merge with trunk