Make it a bit less sloppy? :o)
Merge pull request #1 from mekanix/master

Make it a bit less sloppy? :o)