Initial changes
Merge branch 'master' of https://github.com/gustavo-gomez/Bastard