Merge pull request #90 from learn-more/master

Various fixes / additions
Merge branch 'master' of https://github.com/yvt/openspades