Merge PR #422 from 'kevinamadeus/master'