Bugs on my previous pull request

I made some terrible mistakes on my previous commits... The question is how did it work on my pc... Now it's completely tested and it works.

The problem was I switched from a private branch (my website) to the public one and smartgit messed up the code.

Sorry, and I hope I can start developing some little features when I finish correcting bugs :)