Attempt to get show animation working and general clean-up
Merge branch 'master' of github.com:nijk/sFix