bug fixies
Merge branch 'master' of github.com:ivanbarlog/GitSmash