Fixed some stuff
Fixed something else
WTF?
Merge pull request #1 from kapitano/master

Fixed some stuff