Fixed some files (issue #47)