Merge pull request #47 from Cook1fan/master

Merge pull request #55 from 394802198/master
Merge pull request #48 from Cook1fan/master

re
2014-03-31
Merge pull request #56 from 394802198/master

Steven