Major bug fix
Version 0.1.3