Lazy loaded modules fixes #1
0.5.0