Fixit

took a stab and fixed #95 as this is key to our demo

@fcduarte @amitbharadwaj please review ASAP