Merge pull request #17 from LazyLazarus/master

Request for pull
rectified faults