Merge pull request #9 from rshipp/master