Merge pull request #18 from serg-kakurin/master

More tweaking
Erh
What's going on? :(
Columns!
Merge pull request #20 from serg-kakurin/gh-pages

Columns!