Bugfixes and more
Merge pull request #1 from getBlogg/Development

Bugfixes and more