Improving contribution rules to ensure more streamlined contribution flow

This is implementation of #411 issue. I've also changed grammar a bit.