Merge pull request #15 from jcrom/master

merge with trunk