Merge pull request #36 from ysb33r/development

Merge updates for Beta-1 to master
Merge pull request #41 from ysb33r/development

FIXED #35, #38, #39