20140403 0948
Merge remote-tracking branch 'origin/master'
Merge pull request #60 from 394802198/master

Steven
Merge pull request #55 from Cook1fan/master

Steven