Fixes #8

Please code-review @vsacheti @sylvio