Merge pull request #134 from Cook1fan/master

Steven
2014-06-18
Merge remote-tracking branch 'origin/master'

Conflicts:
	README.md
Merge pull request #138 from 394802198/master

Steven