Merge pull request #28 from jhaddow/master

Merging stuff, I don't know what
Val and Spinner
Merge pull request #29 from SocketBot/master

Val and Spinner