Updated the way I like it (issue #11)