Feature/hackathon

Features and fixes done during nodejs hackathon.