Cleaned up code a bit
Merge branch 'master' of github.com:jgautsch/QuillPrawn