version 1.0
Merge https://github.com/NathanTCz/stuphapp