Merge pull request #43 from buddytex/Dev

Fixing stuff