Merge pull request #13 from jcrom/master

merge with trunk