Merge pull request #17 from jcrom/master

merge with trunk