ditzel Merge pull request #11 from smitdylan2001/Performance