Fixes #9 - Adding ability to override conventions