Sagi dev -> Master

fix compiling errors
changed datat file name
fix #15