Merge pull request #3 from swirlycheetah/master

updates