Merge pull request #48 from dashinfall3/omar

Omar
debugging