Fix for issue 10 and issue 4

I know this is two fixes in one, so take it or leave it, but I couldn't figure out how to exclude a certain commit/file from it. If you want just the issue 10 fix, exclude the changes to pss.py. I can do the very very basics with git (push/pull/commit), but I can see I'm going to have to invest some serious time learning git branches and switches and all that in the near future. I've spent enough time on this for now. :-)