Pull Request Dev_1.0

a space po should be enough to separate your functions, please remove the /*------*/