Merge pull request #159 from evoskuil/version2

Refactor for stealth changes.