Merge pull request #1 from segnorblues/master

Scott approves of Balazs's work.
Changes after Balazs committed
I'm merging the changes.