Fixes

FIXES

Signed-off-by: Michael Frohberg <michael.frohberg@gmail.com>
Merge branch 'master' of https://github.com/MichaelFrohberg/michaelfrohberg.github.com