Merge pull request #55 from Cook1fan/master

Steven
2014-04-03
Merge pull request #61 from 394802198/master

Steven