Merge pull request #18 from psenough/master

updates