NFLabs/zeppelin — pull request #143 by Leemoonsoo (2014-10-11 23:22:00+00:00)
Title: Bringing some important changes from master to branch-0.4

Bringing some important changes from master to branch-0.4

Ready to mege