Added the important things
Merge pull request #1 from pnw/patch-1

Added the important things