Merge pull request #10 from jcrom/master

merge with trunk