Made more modular
Merge branch 'master' into modular
Merge pull request #5 from Rubykuby/modular

Made more modular