Merge pull request #13 from tomaszrondio/master

fixes
Responsive fixes
Merge pull request #14 from aleksandarjelicic/master

Responsive fixes
fixes
merge