Fix #16 Thanks @unak