Fix for #13 and further enhancements
Fix for python 3.2 issue and cosmetic changes
Merge pull request #20 from uschmidt83/master

Fix for #13 and further enhancements