Merge pull request #3 from tiger-swallowtails-2013/questions

What beautiful code David! (AKA Kiera as David) (AKA Kiera accepting pull request as David as Kiera)
Merge branch 'master' into questions