Pull request for sake of pull request#5

lecafard wants to merge 2 commits intoquadrupleslap:masterquadrupleslap/classes:masterfrom

lecafard:masterlecafard/classes:masterCopy head branch name to clipboard