Nicer looking code + added @author Armandi & Lukasz