Merge pull request #1 from inthepoche/dev

Dev
Fixes bug 359
Merge pull request #381 from tcitworld/dev

Flattr Class : Bug 359