kane-c/joffrey — pull request #9 by phradion (2013-07-24 08:46:06+00:00)
Title: fixes #8 #5 #3 

solidified code