Merge pull request #8 from delasky/master

merging down