Merge pull request #22 from C-Compton/master

Pull Thu's update into alpha
Merge pull request #23 from C-Compton/ALPHA

Merge pull request #22 from C-Compton/master