20140404 0821
Merge pull request #64 from 394802198/master

Steven
Merge pull request #59 from Cook1fan/master

Steven