Cleanup work
Merge branch 'master' of github.com:psbanka/silverlantern