small fixes
Big merge
asdfasf
Merge branch 'style' of github.com:jaluce/Like-A-Rock into style