Refactored shoulda package. fixes #1