Merge pull request #2 from bigethan/master

tests and convention