V 0.0.16 Fixes bug #36 and NOTE #37