Split files, fixed Issue #35.