Fixed Bugs. Ready for Submission 1.0
Merge pull request #1 from Asajz/develop

Fixed Bugs. Ready for Submission 1.0