Fixes #1

Adding some standards to the mix :)