This will cause trouble
Merge pull request #335 from sca4/conflict

This will cause trouble