just comitting my small changes before a pull
Merge branch 'master' of https://github.com/runnedrun/proto1