changes
Merge branch 'master' of github.com:pcmakine/Napper
bug fixes etc
Merge branch 'master' of github.com:pcmakine/Napper