Github bug #15
DEV merge