1.34 Cleaned up code
Merge branch 'master' of https://github.com/rids43/Nypt