Stackoverflow refactorings
Merge pull request #52 from sehe/develop

Stackoverflow refactorings