Merge pull request #16 from jcrom/master

merge with trunk