zenozeng Merge pull request #12 from berhoel/replace_obsolete_code