Merge pull request #33 from avasquez614/master

Several fixes
Merge pull request #34 from avasquez614/master

Fix for CRAFTERCMS-646