Runtime fallout
Merge pull request #101 from vhbit/runtime-fallout

Runtime fallout