Merge pull request #22 from C-Compton/master

Pull Thu's update into alpha and merge with  master