This is richards commit
Merge pull request #1 from crissu/richard-branch

Please Add my branch!
rezolved conflicts