Fix more bugs for Prog! (He Overworks me :))
Merge pull request #113 from alexbegt/1.7.x

Fix more bugs for Prog! (He Overworks me :))